npz: do not sort keys, use archive/zip.File order

sbinet · Nov 19, 2020 · cea961e · cea961e
1 parent 55042cb
commit cea961e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/npz/npz_example_test.go b/npz/npz_example_test.go
@@ -39,8 +39,8 @@ func ExampleOpen() {
 	fmt.Printf("arr1: %v\n", f1)
 
 	// Output:
-	// arr0.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
 	// arr1.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[6 1]}}
+	// arr0.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
 	// arr0: [0 1 2 3 4 5]
 	// arr1: [0 1 2 3 4 5]
 }
@@ -82,8 +82,8 @@ func ExampleReader() {
 	fmt.Printf("arr1: %v\n", f1)
 
 	// Output:
-	// arr0.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
 	// arr1.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[6 1]}}
+	// arr0.npy: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
 	// arr0: [0 1 2 3 4 5]
 	// arr1: [0 1 2 3 4 5]
 }

diff --git a/npz/reader.go b/npz/reader.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"sort"
 
 	"github.com/sbinet/npyio/npy"
 )
@@ -69,7 +68,6 @@ func Open(name string) (*Reader, error) {
 	for i, f := range rz.File {
 		keys[i] = f.Name
 	}
-	sort.Strings(keys)
 
 	return &Reader{
 		r:    r,
@@ -91,7 +89,6 @@ func NewReader(r io.ReaderAt, size int64) (*Reader, error) {
 	for i, f := range rz.File {
 		keys[i] = f.Name
 	}
-	sort.Strings(keys)
 
 	return &Reader{
 		r:    r,

diff --git a/testdata/data_float64_corder.npz.txt b/testdata/data_float64_corder.npz.txt
@@ -1,9 +1,9 @@
 ================================================================================
 file: testdata/data_float64_corder.npz
-entry: arr0.npy
-npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
-data = [0 1 2 3 4 5]
-
 entry: arr1.npy
 npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[6 1]}}
 data = [0 1 2 3 4 5]
+
+entry: arr0.npy
+npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:false, Shape:[2 3]}}
+data = [0 1 2 3 4 5]
diff --git a/testdata/data_float64_forder.npz.txt b/testdata/data_float64_forder.npz.txt
@@ -1,9 +1,9 @@
 ================================================================================
 file: testdata/data_float64_forder.npz
-entry: arr0.npy
-npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:true, Shape:[2 3]}}
-data = [0 1 2 3 4 5]
-
 entry: arr1.npy
 npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:true, Shape:[6 1]}}
 data = [0 1 2 3 4 5]
+
+entry: arr0.npy
+npy-header: Header{Major:1, Minor:0, Descr:{Type:<f8, Fortran:true, Shape:[2 3]}}
+data = [0 1 2 3 4 5]