Merge pull request #5 from ambaker1/null-tensor

null tensor now supported.

build.tcl

@@ -1,7 +1,7 @@
 package require tin 1.0
 tin import assert from tin
 tin import tcltest
-set version 0.3
+set version 0.3.1
 set config ""
 dict set config VERSION $version
 
@@ -19,7 +19,7 @@ puts "Running all tests..."
 source tests/vector_test.tcl
 source tests/matrix_test.tcl
 source tests/tensor_test.tcl
-source tests/examples.tcl 
+source tests/examples.tcl
 
 # Check number of failed tests
 set nFailed $::tcltest::numTests(Failed)

doc/template/version.tex

@@ -1 +1 @@
-\newcommand{\version}{0.3}
+\newcommand{\version}{0.3.1}

install.tcl

@@ -1,4 +1,4 @@
 package require tin 1.0
-set dir [tin mkdir -force ndlist 0.3]
+set dir [tin mkdir -force ndlist 0.3.1]
 file copy pkgIndex.tcl ndlist.tcl vector.tcl matrix.tcl tensor.tcl $dir
 file copy README.md LICENSE $dir

ndlist.tcl

@@ -19,4 +19,4 @@ namespace eval ::ndlist {
 }
 
 # Finally, provide the package
-package provide ndlist 0.3
+package provide ndlist 0.3.1

pkgIndex.tcl

@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6]} {return}
-package ifneeded ndlist 0.3 [list source [file join $dir ndlist.tcl]]
+package ifneeded ndlist 0.3.1 [list source [file join $dir ndlist.tcl]]

src/tensor.tin

@@ -115,7 +115,7 @@ proc ::ndlist::IsShape {ndlist args} {
 # GetShape --
 #
 # Private procedure to get list of dimensions of an ND-list along first index
-# Returns error if there is a null dimension along an axis.
+# Returns error if there is a null dimension along a non-zero axis.
 #
 # Syntax:
 # GetShape $ndims $ndlist
@@ -125,11 +125,15 @@ proc ::ndlist::IsShape {ndlist args} {
 # ndlist        ND-list to get dimensions from
 
 proc ::ndlist::GetShape {ndims ndlist} {
+    # Null case
+    if {[llength $ndlist] == 0} {
+        return [lrepeat $ndims 0]
+    }
     # Get list of dimensions (along first index)
     set dims ""
     foreach axis [range $ndims] {
         if {[llength $ndlist] == 0} {
-            return -code error "null dimension along axis $axis"
+            return -code error "null dimension along non-zero axis"
         }
         lappend dims [llength $ndlist]
         set ndlist [lindex $ndlist 0]

tensor.tcl

@@ -115,7 +115,7 @@ proc ::ndlist::IsShape {ndlist args} {
 # GetShape --
 #
 # Private procedure to get list of dimensions of an ND-list along first index
-# Returns error if there is a null dimension along an axis.
+# Returns error if there is a null dimension along a non-zero axis.
 #
 # Syntax:
 # GetShape $ndims $ndlist
@@ -125,11 +125,15 @@ proc ::ndlist::IsShape {ndlist args} {
 # ndlist        ND-list to get dimensions from
 
 proc ::ndlist::GetShape {ndims ndlist} {
+    # Null case
+    if {[llength $ndlist] == 0} {
+        return [lrepeat $ndims 0]
+    }
     # Get list of dimensions (along first index)
     set dims ""
     foreach axis [range $ndims] {
         if {[llength $ndlist] == 0} {
-            return -code error "null dimension along axis $axis"
+            return -code error "null dimension along non-zero axis"
         }
         lappend dims [llength $ndlist]
         set ndlist [lindex $ndlist 0]

tests/tensor_test.tcl

@@ -25,9 +25,9 @@ test nshape {
     nshape 2D {{1 2} {3 4} {5 6}}
 } -result {3 2}
 
-# Blanks must be contained within a list.
-test nshape_blank0 {} -body {nshape 2D ""} -returnCodes {1} -result {null dimension along axis 0}
-test nshape_blank1 {} -body {nshape 2D {{}}} -returnCodes {1} -result {null dimension along axis 1}
+# Blanks must be contained within a list, unless if entire ndlist is blank.
+test nshape_blank0 {} -body {nshape 2D ""} -result {0 0}
+test nshape_blank1 {} -body {nshape 2D {{}}} -returnCodes {1} -result {null dimension along non-zero axis}
 test nshape_blank2 {} {nshape 2D {{{}}}} {1 1}
 
 # nsize