Changeset 38418 for branches/eam_branches/ohana.20150429/src/libfits/test

Timestamp:

Jun 6, 2015, 8:40:19 PM (11 years ago)

Author:

eugene

Message:

trying to improve the speed of the compression shuffle step; added NONE_1 for testing; added timing traces in uncompress to test speed improvements

Location:

branches/eam_branches/ohana.20150429/src/libfits/test

Files:

• compress.sh (modified) (4 diffs)
• imagecomp.c (modified) (1 diff)
• tablecomp.c (modified) (1 diff)

branches/eam_branches/ohana.20150429/src/libfits/test/compress.sh

@@ -5 +5 @@
   tapPLAN 88
 
-  foreach mode NONE GZIP_1 GZIP_2 RICE_1 RICE_ONE
+  foreach mode NONE NONE_1 NONE_2 GZIP_1 GZIP_2 RICE_1 RICE_ONE
   # foreach mode GZIP_1
   # foreach mode GZIP_2
@@ -44 +44 @@
 
  if ($cmpmode == NONE) return
+ if ($cmpmode == NONE_1) return
+ if ($cmpmode == NONE_2) return
 
  if ($cmpmode == GZIP_1)
@@ -311 +313 @@
   local format cmpmode
 
-  foreach cmpmode NONE GZIP_1 GZIP_2 RICE_1 RICE_ONE
+  foreach cmpmode NONE NONE_1 NONE_2 GZIP_1 GZIP_2 RICE_1 RICE_ONE
     test_table_rnd $cmpmode
   end
@@ -417 +419 @@
 
  if ($cmpmode == NONE) return; # funpack will not recognize NONE
+ if ($cmpmode == NONE_1) return; # funpack will not recognize NONE
+ if ($cmpmode == NONE_2) return; # funpack will not recognize NONE
  if ($cmpmode == RICE_ONE) return; # funpack will not recognize RICE_ONE for tables
 

branches/eam_branches/ohana.20150429/src/libfits/test/imagecomp.c

@@ -8 +8 @@
 
 // char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
-char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", NULL};
+char *cmptype[] = {"NONE", "NONE_1", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", NULL};
 int bitpix[] = {8, 16, 32, -32, -64, 0};
 

branches/eam_branches/ohana.20150429/src/libfits/test/tablecomp.c

@@ -8 +8 @@
 int test_compress_single_full (char *zcmptype);
 
-char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", "AUTO", NULL};
+char *cmptype[] = {"NONE", "NONE_1", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", "AUTO", NULL};
 
 int main (int argc, char **argv) {