Rename HDF5 functions: 33/16833/3
Antoine ELIAS [Thu, 9 Jul 2015 15:08:59 +0000 (17:08 +0200)]
export_to_hdf5 -> hdf5_save
import_from_hdf5 -> hdf5_load
is_hdf5_file -> hdf5_is_file
listvar_in_hdf5 -> hdf5_listvar

Mapping:

load -> hdf5_load
save -> hdf5_save
listvarinfile -> hdf5_listvar

Change-Id: I353625922471ac29583dea9cd3bc1737792e11b8

87 files changed:
scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.dia.ref
scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.tst
scilab/modules/api_scilab/tests/nonreg_tests/bug_7242.dia.ref
scilab/modules/api_scilab/tests/nonreg_tests/bug_7242.tst
scilab/modules/fileio/macros/listvarinfile.sci [deleted file]
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/includes/gw_hdf5.h
scilab/modules/hdf5/includes/hdf5_gw.hxx
scilab/modules/hdf5/includes/hdf5_load_v1.hxx [moved from scilab/modules/hdf5/includes/import_from_hdf5_v1.hxx with 88% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_is_file.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp with 100% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp with 89% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v2.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp with 99% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp with 97% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp with 87% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v1.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5_v1.cpp with 99% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v2.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5_v2.cpp with 99% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5_v3.cpp with 97% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_save.cpp [moved from scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp with 96% similarity]
scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
scilab/modules/hdf5/tests/nonreg_tests/bug_11954.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_11954.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_12285.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_12285.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_5629.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_5629.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_6440.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_6440.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_7224.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_7224.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_8170.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_8170.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_8383.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_8383.tst
scilab/modules/hdf5/tests/nonreg_tests/bug_9510.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/bug_9510.tst
scilab/modules/hdf5/tests/nonreg_tests/matrix_as_input.dia.ref
scilab/modules/hdf5/tests/nonreg_tests/matrix_as_input.tst
scilab/modules/hdf5/tests/unit_tests/exportImportHdf5.dia.ref [deleted file]
scilab/modules/hdf5/tests/unit_tests/loadhdf5data.tst
scilab/modules/hdf5/tests/unit_tests/loadhdf5data_v1.dia.ref
scilab/modules/hdf5/tests/unit_tests/loadhdf5data_v1.tst
scilab/modules/hdf5/tests/unit_tests/saveloadHdf5.tst [moved from scilab/modules/hdf5/tests/unit_tests/exportImportHdf5.tst with 95% similarity]
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/includes/io_gw.hxx
scilab/modules/io/macros/%_save.sci [deleted file]
scilab/modules/io/src/cpp/io_gw.cpp
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/io/src/cpp/io_gw.vcxproj.filters
scilab/modules/modules_manager/macros/tbx_build_blocks.sci
scilab/modules/signal_processing/tests/unit_tests/syredi.dia.ref
scilab/modules/signal_processing/tests/unit_tests/syredi.tst
scilab/modules/xcos/macros/%Block_xcosUpdateBlock.sci
scilab/modules/xcos/macros/importScicosPal.sci
scilab/modules/xcos/macros/xcosPalAdd.sci
scilab/modules/xcos/macros/xcosPalAddBlock.sci
scilab/modules/xcos/macros/xcosPalExport.sci
scilab/modules/xcos/tests/nonreg_tests/bug_6776.dia.ref
scilab/modules/xcos/tests/nonreg_tests/bug_6776.tst
scilab/modules/xcos/tests/nonreg_tests/bug_7269.tst
scilab/modules/xcos/tests/nonreg_tests/bug_7537.dia.ref
scilab/modules/xcos/tests/nonreg_tests/bug_7537.tst
scilab/modules/xcos/tests/nonreg_tests/bug_7716.dia.ref
scilab/modules/xcos/tests/nonreg_tests/bug_7716.tst
scilab/modules/xcos/tests/nonreg_tests/bug_9478.dia.ref
scilab/modules/xcos/tests/nonreg_tests/bug_9478.tst
scilab/modules/xcos/tests/unit_tests/block_tests/ESELECT_f/sinus.dia.ref
scilab/modules/xcos/tests/unit_tests/block_tests/ESELECT_f/sinus.tst
scilab/modules/xcos/tests/unit_tests/xcosPalAdd.dia.ref
scilab/modules/xcos/tests/unit_tests/xcosPalAdd.tst
scilab/modules/xcos/tests/unit_tests/xcosPalAddBlock.dia.ref
scilab/modules/xcos/tests/unit_tests/xcosPalAddBlock.tst
scilab/modules/xcos/tests/unit_tests/xcosPalExport.dia.ref
scilab/modules/xcos/tests/unit_tests/xcosPalExport.tst
scilab/test/good/%diagram_xcos.sci
scilab/test/good/importScicosPal.sci
scilab/test/good/xcosBlockEval.sci
scilab/test/good/xcosBlockInterface.sci
scilab/test/good/xcosCodeGeneration.sci
scilab/test/good/xcosPalAddBlock.sci
scilab/test/good/xcosPalExport.sci

index 50fc0ef..0abd967 100644 (file)
@@ -19,7 +19,7 @@ listRef(1) = 1;
 listRef(4) = list(1,2,3);
 listRef(5) = 1;
 myList = listRef;
-export_to_hdf5(TMPDIR + "/test.sod", "myList");
+save(TMPDIR + "/test.sod", "myList");
 clear myList;
-import_from_hdf5(TMPDIR + "/test.sod");
+load(TMPDIR + "/test.sod");
 assert_checkequal(listRef, myList);
index e2c5c9d..e9be61b 100644 (file)
@@ -12,7 +12,7 @@
 // http://bugzilla.scilab.org/show_bug.cgi?id=11461
 //
 // <-- Short Description -->
-//  
+//
 //  api_list was not able to create lists and sub lists with undefined items
 
 listRef = list();
@@ -20,8 +20,8 @@ listRef(1) = 1;
 listRef(4) = list(1,2,3);
 listRef(5) = 1;
 myList = listRef;
-export_to_hdf5(TMPDIR + "/test.sod", "myList");
+save(TMPDIR + "/test.sod", "myList");
 clear myList;
-import_from_hdf5(TMPDIR + "/test.sod");
+load(TMPDIR + "/test.sod");
 assert_checkequal(listRef, myList);
 
index cebaec6..f95eabc 100644 (file)
 // <-- Short Description -->
 //  API was unable to retrieve named variable address 
 //  when variable name is passed in argument of function
-function myExport(data, filepath)
-    export_to_hdf5(filepath, "data");
+function result = myExport(data, filepath)
+    result = %t
+    try
+        save(filepath, "data");
+    catch
+        retult = %f;
+    end
 endfunction
 myData = "blam";
 myFile = TMPDIR + "/myFile.sod";
-myExport(myData, myFile); // Should not produce any error
+if ~myExport(myData, myFile) then bugmes();quit;end
+
index 14b3a24..cff3d0d 100644 (file)
 //  API was unable to retrieve named variable address
 //  when variable name is passed in argument of function
 
-function myExport(data, filepath)
-    export_to_hdf5(filepath, "data");
+function result = myExport(data, filepath)
+    result = %t
+    try
+        save(filepath, "data");
+    catch
+        retult = %f;
+    end
 endfunction
 
 myData = "blam";
diff --git a/scilab/modules/fileio/macros/listvarinfile.sci b/scilab/modules/fileio/macros/listvarinfile.sci
deleted file mode 100644 (file)
index db2f90a..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2012 - DIGITEO - Antoine ELIAS
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
-
-function varargout = listvarinfile(filename)
-
-    [lhs, rhs] = argn();
-    if rhs <> 1 then
-        error(999, msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"), "listvarinfile", 1));
-    end
-
-    if typeof(filename) <> "string" | size(filename, "*") <> 1 then
-        error(999, msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"), "listvarinfile", 1));
-    end
-
-    if isfile(filename) & is_hdf5_file(filename) then
-        listvarFunction = listvar_in_hdf5;
-    else
-        error(999, msprintf(gettext("%s: Cannot open file %s.\n"), "listvarinfile", filename));
-    end
-
-    //check output argument count
-    if lhs == 1 then
-        a = listvarFunction(filename);
-        varargout = list(a);
-    elseif lhs == 2 then
-        [a,b] = listvarFunction(filename);
-        varargout = list(a,b);
-    elseif lhs == 3 then
-        [a,b,c] = listvarFunction(filename);
-        varargout = list(a,b,c);
-    elseif lhs == 4 then
-        [a,b,c,d] = listvarFunction(filename);
-        varargout = list(a,b,c,d);
-    end
-endfunction
index 5cd5497..8431c38 100644 (file)
@@ -50,15 +50,15 @@ HDF5_CXX_SOURCES = \
 
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/hdf5_gw.cpp \
-    sci_gateway/cpp/sci_export_to_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v2.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v3.cpp \
-    sci_gateway/cpp/sci_is_hdf5_file.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v1.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp \
+    sci_gateway/cpp/sci_hdf5_save.cpp \
+    sci_gateway/cpp/sci_hdf5_load.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v1.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v2.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v3.cpp \
+    sci_gateway/cpp/sci_hdf5_is_file.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar_v2.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar_v3.cpp \
     sci_gateway/cpp/sci_hdf5_file_version.cpp \
     sci_gateway/cpp/sci_h5dump.cpp \
     sci_gateway/cpp/sci_h5open.cpp \
index 8aa5f82..d093ee3 100644 (file)
@@ -207,15 +207,15 @@ am__v_lt_1 =
 am__DEPENDENCIES_1 =
 libscihdf5_la_DEPENDENCIES = libscihdf5-algo.la $(am__DEPENDENCIES_1)
 am__objects_3 = sci_gateway/cpp/libscihdf5_la-hdf5_gw.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo \
-       sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo \
+       sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo \
        sci_gateway/cpp/libscihdf5_la-sci_hdf5_file_version.lo \
        sci_gateway/cpp/libscihdf5_la-sci_h5dump.lo \
        sci_gateway/cpp/libscihdf5_la-sci_h5open.lo \
@@ -651,15 +651,15 @@ HDF5_CXX_SOURCES = \
 
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/hdf5_gw.cpp \
-    sci_gateway/cpp/sci_export_to_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v2.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v3.cpp \
-    sci_gateway/cpp/sci_is_hdf5_file.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5.cpp \
-    sci_gateway/cpp/sci_import_from_hdf5_v1.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp \
-    sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp \
+    sci_gateway/cpp/sci_hdf5_save.cpp \
+    sci_gateway/cpp/sci_hdf5_load.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v1.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v2.cpp \
+    sci_gateway/cpp/sci_hdf5_load_v3.cpp \
+    sci_gateway/cpp/sci_hdf5_is_file.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar_v2.cpp \
+    sci_gateway/cpp/sci_hdf5_listvar_v3.cpp \
     sci_gateway/cpp/sci_hdf5_file_version.cpp \
     sci_gateway/cpp/sci_h5dump.cpp \
     sci_gateway/cpp/sci_h5open.cpp \
@@ -1057,31 +1057,31 @@ sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/cpp/libscihdf5_la-hdf5_gw.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo:  \
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libscihdf5_la-sci_hdf5_file_version.lo:  \
@@ -1176,7 +1176,6 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-hdf5_gw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_export_to_hdf5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_h5attr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_h5close.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_h5cp.Plo@am__quote@
@@ -1199,14 +1198,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_h5umount.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_h5write.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_file_version.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_is_hdf5_file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_is_file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_save.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_percent_H5Object_e.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_percent_H5Object_fieldnames.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_percent_H5Object_p.Plo@am__quote@
@@ -1498,68 +1498,68 @@ sci_gateway/cpp/libscihdf5_la-hdf5_gw.lo: sci_gateway/cpp/hdf5_gw.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-hdf5_gw.lo `test -f 'sci_gateway/cpp/hdf5_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/hdf5_gw.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo: sci_gateway/cpp/sci_export_to_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_export_to_hdf5.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo `test -f 'sci_gateway/cpp/sci_export_to_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_export_to_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_export_to_hdf5.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_export_to_hdf5.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_export_to_hdf5.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo: sci_gateway/cpp/sci_hdf5_save.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_save.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo `test -f 'sci_gateway/cpp/sci_hdf5_save.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_save.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_save.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_save.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_save.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_export_to_hdf5.lo `test -f 'sci_gateway/cpp/sci_export_to_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_export_to_hdf5.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_save.lo `test -f 'sci_gateway/cpp/sci_hdf5_save.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_save.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo: sci_gateway/cpp/sci_import_from_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_import_from_hdf5.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo: sci_gateway/cpp/sci_hdf5_load.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo `test -f 'sci_gateway/cpp/sci_hdf5_load.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_load.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load.lo `test -f 'sci_gateway/cpp/sci_hdf5_load.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo: sci_gateway/cpp/sci_import_from_hdf5_v2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v2.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v2.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v2.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_import_from_hdf5_v2.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo: sci_gateway/cpp/sci_hdf5_load_v1.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v1.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v1.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v1.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v1.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_load_v1.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v2.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v2.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v1.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v1.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo: sci_gateway/cpp/sci_import_from_hdf5_v3.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v3.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v3.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v3.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v3.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_import_from_hdf5_v3.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo: sci_gateway/cpp/sci_hdf5_load_v2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v2.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v2.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_load_v2.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v3.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v3.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v2.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v2.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo: sci_gateway/cpp/sci_is_hdf5_file.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_is_hdf5_file.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo `test -f 'sci_gateway/cpp/sci_is_hdf5_file.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_is_hdf5_file.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_is_hdf5_file.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_is_hdf5_file.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_is_hdf5_file.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo: sci_gateway/cpp/sci_hdf5_load_v3.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v3.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v3.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v3.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_load_v3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_load_v3.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_is_hdf5_file.lo `test -f 'sci_gateway/cpp/sci_is_hdf5_file.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_is_hdf5_file.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_load_v3.lo `test -f 'sci_gateway/cpp/sci_hdf5_load_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_load_v3.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo: sci_gateway/cpp/sci_listvar_in_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_listvar_in_hdf5.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo: sci_gateway/cpp/sci_hdf5_is_file.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_is_file.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo `test -f 'sci_gateway/cpp/sci_hdf5_is_file.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_is_file.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_is_file.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_is_file.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_is_file.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_is_file.lo `test -f 'sci_gateway/cpp/sci_hdf5_is_file.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_is_file.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo: sci_gateway/cpp/sci_import_from_hdf5_v1.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v1.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v1.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v1.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_import_from_hdf5_v1.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_import_from_hdf5_v1.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo: sci_gateway/cpp/sci_hdf5_listvar.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_listvar.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_import_from_hdf5_v1.lo `test -f 'sci_gateway/cpp/sci_import_from_hdf5_v1.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_import_from_hdf5_v1.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo: sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v2.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v2.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v2.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo: sci_gateway/cpp/sci_hdf5_listvar_v2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v2.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar_v2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v2.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_listvar_v2.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v2.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5_v2.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v2.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar_v2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar_v2.cpp
 
-sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo: sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v3.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v3.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_listvar_in_hdf5_v3.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo: sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v3.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v3.Tpo sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_listvar_v3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_hdf5_listvar_v3.cpp' object='sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_listvar_in_hdf5_v3.lo `test -f 'sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_listvar_in_hdf5_v3.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_listvar_v3.lo `test -f 'sci_gateway/cpp/sci_hdf5_listvar_v3.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
 
 sci_gateway/cpp/libscihdf5_la-sci_hdf5_file_version.lo: sci_gateway/cpp/sci_hdf5_file_version.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihdf5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscihdf5_la-sci_hdf5_file_version.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscihdf5_la-sci_hdf5_file_version.Tpo -c -o sci_gateway/cpp/libscihdf5_la-sci_hdf5_file_version.lo `test -f 'sci_gateway/cpp/sci_hdf5_file_version.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_hdf5_file_version.cpp
index bc25b70..8a6821e 100644 (file)
 HDF5_SCILAB_IMPEXP int Initialize(void);
 HDF5_SCILAB_IMPEXP int Finalize(void);
 /*--------------------------------------------------------------------------*/
-HDF5_SCILAB_IMPEXP int sci_import_from_hdf5_v1(char *fname, int* pvApiCtx);
-HDF5_SCILAB_IMPEXP int sci_import_from_hdf5_v2(char *fname, int* pvApiCtx);
-HDF5_SCILAB_IMPEXP int sci_listvar_in_hdf5_v2(char *fname, int* pvApiCtx);
-HDF5_SCILAB_IMPEXP int sci_is_hdf5_file(char *fname, int* pvApiCtx);
+HDF5_SCILAB_IMPEXP int sci_hdf5_load_v1(char *fname, int* pvApiCtx);
+HDF5_SCILAB_IMPEXP int sci_hdf5_load_v2(char *fname, int* pvApiCtx);
+HDF5_SCILAB_IMPEXP int sci_hdf5_listvar_v2(char *fname, int* pvApiCtx);
+HDF5_SCILAB_IMPEXP int sci_hdf5_is_file(char *fname, int* pvApiCtx);
 HDF5_SCILAB_IMPEXP int sci_h5dump(char *fname, int* pvApiCtx);
 HDF5_SCILAB_IMPEXP int sci_h5open(char *fname, int* pvApiCtx);
 HDF5_SCILAB_IMPEXP int sci_h5close(char *fname, int* pvApiCtx);
index 1bcd4b2..1ec30e0 100644 (file)
@@ -20,11 +20,11 @@ extern "C"
 #include "dynlib_hdf5_scilab.h"
 }
 
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_export_to_hdf5, HDF5_SCILAB_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_import_from_hdf5, HDF5_SCILAB_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_import_from_hdf5_v3, HDF5_SCILAB_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_listvar_in_hdf5, HDF5_SCILAB_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_listvar_in_hdf5_v3, HDF5_SCILAB_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_save, HDF5_SCILAB_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_load, HDF5_SCILAB_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_load_v3, HDF5_SCILAB_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_listvar, HDF5_SCILAB_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_listvar_v3, HDF5_SCILAB_IMPEXP);
 CPP_GATEWAY_PROTOTYPE_EXPORT(sci_hdf5_file_version, HDF5_SCILAB_IMPEXP);
 
 #endif /* !__HDF5_GW_HXX__ */
@@ -10,4 +10,4 @@
 *
 */
 
-int sci_import_from_hdf5_v1(char *fname, int* pvCtx);
+int sci_hdf5_load_v1(char *fname, int* pvCtx);
@@ -27,9 +27,9 @@ extern "C"
 #include "h5_readDataFromFile.h"
 }
 
-static const std::string fname("listvar_in_hdf5");
+static const std::string fname("hdf5_listvar");
 
-types::Function::ReturnValue sci_listvar_in_hdf5(types::typed_list &in, int _iRetCount, types::typed_list &out)
+types::Function::ReturnValue sci_hdf5_listvar(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
     int rhs = static_cast<int>(in.size());
     if (rhs < 1)
@@ -67,12 +67,12 @@ types::Function::ReturnValue sci_listvar_in_hdf5(types::typed_list &in, int _iRe
         case 1:
         case 2:
         {
-            wstFuncName = L"listvar_in_hdf5_v2";
+            wstFuncName = L"hdf5_listvar_v2";
             break;
         }
         case 3:
         {
-            wstFuncName = L"listvar_in_hdf5_v3";
+            wstFuncName = L"hdf5_listvar_v3";
             break;
         }
         default:
@@ -61,7 +61,7 @@ static bool read_undefined(int _iDatasetId, int _iItemPos, int *_piAddress, VarI
 
 static void generateInfo(VarInfo* _pInfo, const char* _pstType);
 
-int sci_listvar_in_hdf5_v2(char *fname, int* pvApiCtx)
+int sci_hdf5_listvar_v2(char *fname, int* pvApiCtx)
 {
     SciErr sciErr;
     int *piAddr     = NULL;
@@ -63,9 +63,9 @@ static bool read_handles(int dataset, VarInfo6& info);
 static void generateInfo(VarInfo6& info);
 static int getDimsNode(int dataset, int* complex, std::vector<int>& dims);
 
-static const std::string fname("listvar_in_hdf5");
+static const std::string fname("hdf5_listvar");
 
-types::Function::ReturnValue sci_listvar_in_hdf5_v3(types::typed_list &in, int _iRetCount, types::typed_list &out)
+types::Function::ReturnValue sci_hdf5_listvar_v3(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
     int rhs = static_cast<int>(in.size());
     if (rhs != 1)
@@ -291,6 +291,18 @@ static bool read_short_data(int dataset, VarInfo6& info)
     {
         info.type = sci_mlist;
     }
+    else if (type == g_SCILAB_CLASS_HANDLE)
+    {
+        info.type = sci_handles;
+    }
+    else if (type == g_SCILAB_CLASS_MACRO)
+    {
+        info.type = sci_c_function;
+    }
+    else if (type == g_SCILAB_CLASS_USERTYPE)
+    {
+        info.type = sci_pointer;
+    }
     else
     {
         Scierror(999, _("%s: Invalid HDF5 Scilab format.\n"), "listvar_in_hdf5");
@@ -30,9 +30,9 @@ extern "C"
 #include "h5_readDataFromFile.h"
 }
 
-static const std::string fname("import_from_hdf5");
+static const std::string fname("load");
 
-Function::ReturnValue sci_import_from_hdf5(typed_list &in, int _iRetCount, typed_list& out)
+Function::ReturnValue sci_hdf5_load(typed_list &in, int _iRetCount, typed_list& out)
 {
     int rhs = static_cast<int>(in.size());
     if (rhs < 1)
@@ -101,19 +101,19 @@ Function::ReturnValue sci_import_from_hdf5(typed_list &in, int _iRetCount, typed
         case -1:
         case 1:
         {
-            wstFuncName = L"import_from_hdf5_v1";
+            wstFuncName = L"hdf5_load_v1";
             needReprocess = true;
             break;
         }
         case 2:
         {
-            wstFuncName = L"import_from_hdf5_v2";
+            wstFuncName = L"hdf5_load_v2";
             needReprocess = true;
             break;
         }
         case 3:
         {
-            wstFuncName = L"import_from_hdf5_v3";
+            wstFuncName = L"hdf5_load_v3";
             break;
         }
         default :
@@ -143,16 +143,9 @@ Function::ReturnValue sci_import_from_hdf5(typed_list &in, int _iRetCount, typed
         typed_list in2(1, vars);
         typed_list out2;
         std::wstring wstFuncName = L"%_sodload";
-        Callable::ReturnValue Ret = Callable::Error;
-        Ret = Overload::call(wstFuncName, in2, _iRetCount, out2, &exec);
+        ret = Overload::call(wstFuncName, in2, size, out2, &exec);
         vars->DecreaseRef();
 
-        if (out2.size() != size)
-        {
-            Scierror(999, _("%s: Unable to load '%s'\n"), fname.data(), filename.data());
-            return Function::Error;
-        }
-
         symbol::Context* ctx = symbol::Context::getInstance();
         wchar_t** names = vars->get();
 
@@ -53,9 +53,9 @@ static bool import_hypermat_v1(int* pvCtx, int _iDatasetId, int _iVarType, int _
 static bool import_void_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddress, char *_pstVarname);
 static bool import_undefined_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddress, char *_pstVarname);
 
-static const std::string fname("import_from_hdf5");
+static const std::string fname("load");
 
-int sci_import_from_hdf5_v1(char *fn, int* pvApiCtx)
+int sci_hdf5_load_v1(char *fn, int* pvApiCtx)
 {
     SciErr sciErr;
 
@@ -269,7 +269,7 @@ static bool import_data_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
         }
         default:
         {
-            Scierror(999, _("%s: Invalid HDF5 Scilab format.\n"), "import_from_hdf5");
+            Scierror(999, _("%s: Invalid HDF5 Scilab format.\n"), fname.data());
 #ifdef PRINT_DEBUG
             {
                 char pstMsg[512];
@@ -34,7 +34,7 @@ extern "C"
 #include "freeArrayOfString.h"
 }
 
-#include "import_from_hdf5_v1.hxx"
+#include "hdf5_load_v1.hxx"
 
 static bool import_variable(int* pvCtx, int _iFile, char* _pstVarName);
 static bool import_data(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddress, char *_pstVarname);
@@ -52,9 +52,9 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
 static bool import_void(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddress, char *_pstVarname);
 static bool import_undefined(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddress, char *_pstVarname);
 
-static const std::string fname("import_from_hdf5");
+static const std::string fname("load");
 
-int sci_import_from_hdf5_v2(char *fn, int* pvApiCtx)
+int sci_hdf5_load_v2(char *fn, int* pvApiCtx)
 {
     SciErr sciErr;
 
@@ -115,8 +115,7 @@ int sci_import_from_hdf5_v2(char *fn, int* pvApiCtx)
             //call older import functions and exit or ... EXIT !
             if (iVersion == 1 || iVersion == -1)
             {
-                //sciprint("old sci_import_from_hdf5_v1\n");
-                return sci_import_from_hdf5_v1(fn, pvApiCtx);
+                return sci_hdf5_load_v1(fn, pvApiCtx);
             }
         }
     }
@@ -294,7 +293,7 @@ static bool import_data(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAddr
         }
         default:
         {
-            Scierror(999, _("%s: Invalid HDF5 Scilab format.\n"), "import_from_hdf5");
+            Scierror(999, _("%s: Invalid HDF5 Scilab format.\n"), fname.data());
         }
     }
     return bRet;
@@ -70,9 +70,9 @@ static types::InternalType* import_usertype(int dataset);
 
 
 /*--------------------------------------------------------------------------*/
-static const std::string fname("import_from_hdf5");
+static const std::string fname("load");
 /*--------------------------------------------------------------------------*/
-types::Function::ReturnValue sci_import_from_hdf5_v3(types::typed_list &in, int _iRetCount, types::typed_list &out)
+types::Function::ReturnValue sci_hdf5_load_v3(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
     std::string filename;
     int rhs = static_cast<int>(in.size());
@@ -106,21 +106,9 @@ types::Function::ReturnValue sci_import_from_hdf5_v3(types::typed_list &in, int
     int iVersion = getSODFormatAttribute(iFile);
     if (iVersion != SOD_FILE_VERSION)
     {
-        if (iVersion > SOD_FILE_VERSION)
-        {
-            //can't read file with version newer that me !
-            Scierror(999, _("%s: Wrong SOD file format version. Max Expected: %d Found: %d\n"), fname.data(), SOD_FILE_VERSION, iVersion);
-            return types::Function::Error;
-        }
-        else
-        {
-            //call older import functions and exit or ... EXIT !
-            if (iVersion == 1 || iVersion == -1)
-            {
-                //sciprint("old sci_import_from_hdf5_v1\n");
-                //return sci_import_from_hdf5_v1(fname, pvApiCtx);
-            }
-        }
+        //can't read file with version newer that me !
+        Scierror(999, _("%s: Wrong SOD file format version. Expected: %d Found: %d\n"), fname.data(), SOD_FILE_VERSION, iVersion);
+        return types::Function::Error;
     }
 
     if (rhs > 1)
@@ -1045,13 +1033,13 @@ static types::InternalType* import_usertype(int dataset)
 
 
     types::Struct* str = it->getAs<types::Struct>();
-    
-    if(str->isScalar() == false)
+
+    if (str->isScalar() == false)
     {
         delete it;
         return nullptr;
     }
-    
+
     types::SingleStruct* ss = str->get()[0];
 
     //extract type from struct
@@ -72,7 +72,7 @@ static int export_undefined(int parent, const std::string& name);
 /*--------------------------------------------------------------------------*/
 static const std::string fname("save");
 /*--------------------------------------------------------------------------*/
-types::Function::ReturnValue sci_export_to_hdf5(types::typed_list &in, int _iRetCount, types::typed_list &out)
+types::Function::ReturnValue sci_hdf5_save(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
     int iH5File = 0;
     bool bAppendMode = false;
@@ -139,6 +139,17 @@ types::Function::ReturnValue sci_export_to_hdf5(types::typed_list &in, int _iRet
         {
             iH5File = createHDF5File(filename.data());
         }
+        else
+        {
+            int iVersion = getSODFormatAttribute(iH5File);
+            if (iVersion != SOD_FILE_VERSION)
+            {
+                //to update version must be the same
+                closeHDF5File(iH5File);
+                Scierror(999, _("%s: Wrong SOD file format version. Expected: %d Found: %d\n"), fname.data(), SOD_FILE_VERSION, iVersion);
+                return types::Function::Error;
+            }
+        }
     }
     else
     {
@@ -160,18 +171,6 @@ types::Function::ReturnValue sci_export_to_hdf5(types::typed_list &in, int _iRet
         return types::Function::Error;
     }
 
-    if (bAppendMode)
-    {
-        int iVersion = getSODFormatAttribute(iH5File);
-        if (iVersion != SOD_FILE_VERSION)
-        {
-            //to update version must be the same
-            closeHDF5File(iH5File);
-            Scierror(999, _("%s: Wrong SOD file format version. Expected: %d Found: %d\n"), fname.data(), SOD_FILE_VERSION, iVersion);
-            return types::Function::Error;
-        }
-    }
-
     // export data
     for (const auto var : vars)
     {
@@ -227,12 +226,12 @@ types::Function::ReturnValue sci_export_to_hdf5(types::typed_list &in, int _iRet
 static bool isVarExist(int _iFile, const char* _pstVarName)
 {
     //check if variable already exists
-    int iNbItem = getVariableNames(_iFile, NULL);
+    int iNbItem = getVariableNames6(_iFile, NULL);
     if (iNbItem)
     {
         char **pstVarNameList = (char **)MALLOC(sizeof(char *) * iNbItem);
 
-        iNbItem = getVariableNames(_iFile, pstVarNameList);
+        iNbItem = getVariableNames6(_iFile, pstVarNameList);
 
         //import all data
         for (int i = 0; i < iNbItem; i++)
@@ -873,22 +872,33 @@ static int export_usertype(int parent, const std::string& name, types::UserType*
         ast::ExecVisitor exec;
         // rational case
         std::wstring wstFuncName = L"%" + data->getShortTypeStr() + L"_save";
-        types::Callable::ReturnValue ret = Overload::call(wstFuncName, in, 1, out, &exec);
-        if (ret != types::Callable::OK)
-        {
-            return -1;
-        }
 
-        if (out.size() != 1)
+        try
         {
-            for (auto& i : out)
+            types::Callable::ReturnValue ret = Overload::call(wstFuncName, in, 1, out, &exec);
+
+            if (ret != types::Callable::OK)
+            {
+                return -1;
+            }
+
+            if (out.size() != 1)
             {
-                i->killMe();
+                for (auto& i : out)
+                {
+                    i->killMe();
+                }
+                return -1;
             }
+
+            it = out[0];
+        }
+        catch (ast::ScilabError& /*se*/)
+        {
+            //overload does not exist
             return -1;
         }
 
-        it = out[0];
     }
 
     if (it->isUserType())
index 0aea586..93f7bb6 100644 (file)
  Don't touch if you do not know what you are doing
 -->
 <module name="hdf5">
-    <gateway name="sci_export_to_hdf5"                  function="export_to_hdf5"           type="1" />
-    <gateway name="sci_export_to_hdf5"                  function="save"                     type="1" />
-    <gateway name="sci_import_from_hdf5"                function="import_from_hdf5"         type="1" />
-    <gateway name="sci_import_from_hdf5"                function="load"                     type="1" />
-    <gateway name="sci_import_from_hdf5_v1"             function="import_from_hdf5_v1"      type="0" />
-    <gateway name="sci_import_from_hdf5_v2"             function="import_from_hdf5_v2"      type="0" />
-    <gateway name="sci_import_from_hdf5_v3"             function="import_from_hdf5_v3"      type="1" />
-    <gateway name="sci_listvar_in_hdf5"                 function="listvar_in_hdf5"          type="1" />
-    <gateway name="sci_listvar_in_hdf5_v2"              function="listvar_in_hdf5_v2"       type="0" />
-    <gateway name="sci_listvar_in_hdf5_v3"              function="listvar_in_hdf5_v3"       type="1" />
-    <gateway name="sci_is_hdf5_file"                    function="is_hdf5_file"             type="0" />
+    <gateway name="sci_hdf5_save"                       function="save"                     type="1" />
+    <gateway name="sci_hdf5_save"                       function="hdf5_save"                type="1" />
+    <gateway name="sci_hdf5_load"                       function="load"                     type="1" />
+    <gateway name="sci_hdf5_load"                       function="hdf5_load"                type="1" />
+    <gateway name="sci_hdf5_load_v1"                    function="hdf5_load_v1"             type="0" />
+    <gateway name="sci_hdf5_load_v2"                    function="hdf5_load_v2"             type="0" />
+    <gateway name="sci_hdf5_load_v3"                    function="hdf5_load_v3"             type="1" />
+    <gateway name="sci_hdf5_listvar"                    function="hdf5_listvar"             type="1" />
+    <gateway name="sci_hdf5_listvar"                    function="listvarinfile"            type="1" />
+    <gateway name="sci_hdf5_listvar_v2"                 function="hdf5_listvar_v2"          type="0" />
+    <gateway name="sci_hdf5_listvar_v3"                 function="hdf5_listvar_v3"          type="1" />
+    <gateway name="sci_hdf5_is_file"                    function="hdf5_is_file"             type="0" />
     <gateway name="sci_hdf5_file_version"               function="hdf5_file_version"        type="1" />
     <gateway name="sci_h5dump"                          function="h5dump"                   type="0" />
     <gateway name="sci_h5open"                          function="h5open"                   type="0" />
index 6c86427..419d2e4 100644 (file)
@@ -1977,81 +1977,60 @@ int closeList(int _iFile, void *_pvList, char *_pstListName, int _iNbItem, int _
 static int deleteHDF5group(int _iFile, const char* _pstName)
 {
     hid_t status = 0;
-    char** pstChildName = NULL;
-
     //open group
-    char* pstGroupName = createGroupName(_pstName);
-    hid_t groupID = H5Gopen(_iFile, pstGroupName, H5P_DEFAULT);
-    if (groupID >= 0)
-    {
-        int i = 0;
-        H5G_info_t groupInfo;
-        //get children count
-        status = H5Gget_info(groupID, &groupInfo);
-        if (status < 0)
-        {
-            return -1;
-        }
+    hid_t groupID = H5Gopen(_iFile, _pstName, H5P_DEFAULT);
+    //hid_t groupID = H5Gopen(_iFile, _pstName, H5P_DEFAULT);
+    if (groupID < 0)
+    {
+        return -1;
+    }
 
+    int ret = 0;
+    int index = 0;
+    int i = 0;
+    H5G_info_t groupInfo;
+    //get children count
+    status = H5Gget_info(groupID, &groupInfo);
+    if (status != -1)
+    {
+        int index = 0;
         //for each child,
-        for (i = 0 ; i < groupInfo.nlinks ; i++)
-        {
-            char* pstPathName = NULL;
-            //build child path
-            pstPathName = createPathName(pstGroupName, i);
-
-            //try to delete child and his children
-            deleteHDF5group(_iFile, pstPathName);
-            FREE(pstPathName);
-        }
-
-        pstChildName = (char**)MALLOC(sizeof(char*) * groupInfo.nlinks);
-
-        for (i = 0 ; i < groupInfo.nlinks ; i++)
+        for (i = 0; i < groupInfo.nlinks; i++)
         {
             //get child name
-            ssize_t size = H5Lget_name_by_idx(groupID, ".", H5_INDEX_NAME, H5_ITER_INC, i, 0, 0, H5P_DEFAULT) + 1;
-            pstChildName[i] = (char*)MALLOC(sizeof(char) * size);
-            H5Lget_name_by_idx(groupID, ".", H5_INDEX_NAME, H5_ITER_INC, i, pstChildName[i], size, H5P_DEFAULT);
-        }
-
-        for (i = 0 ; i < groupInfo.nlinks ; i++)
-        {
-            //unlink child
-            status = H5Ldelete(groupID, pstChildName[i], H5P_DEFAULT);
-            FREE(pstChildName[i]);
-
-            if (status < 0)
+            ssize_t size = H5Lget_name_by_idx(groupID, ".", H5_INDEX_NAME, H5_ITER_INC, index, 0, 0, H5P_DEFAULT) + 1;
+            char* pstChildName = (char*)MALLOC(sizeof(char) * size);
+            H5Lget_name_by_idx(groupID, ".", H5_INDEX_NAME, H5_ITER_INC, index, pstChildName, size, H5P_DEFAULT);
+            ret = deleteHDF5group(groupID, pstChildName);
+            if (ret == -1)
             {
-                int j = 0;
-                for (j = i + 1; j < groupInfo.nlinks ; j++)
-                {
-                    FREE(pstChildName[j]);
-                }
-
-                FREE(pstChildName);
-                return -1;
+                ++index;
             }
+            ////unlink child
+            //status = H5Ldelete(groupID, pstChildName, H5P_DEFAULT);
+            //FREE(pstChildName);
+
+            //if (status < 0)
+            //{
+            //    return -1;
+            //}
         }
+    }
 
-        FREE(pstChildName);
-        //close group
-        status = H5Gclose(groupID);
-        if (status < 0)
-        {
-            return -1;
-        }
-
-        //delete group
-        status = H5Ldelete(_iFile, pstGroupName, H5P_DEFAULT);
-        if (status < -1)
-        {
-            return -1;
-        }
+    //close group
+    status = closeList6(groupID);
+    if (status < 0)
+    {
+        return -1;
+    }
 
+    //delete group
+    status = H5Ldelete(_iFile, _pstName, H5P_DEFAULT);
+    if (status < 0)
+    {
+        return -1;
     }
 
-    FREE(pstGroupName);
     return 0;
 }
 
@@ -2059,7 +2038,7 @@ static int deleteHDF5group(int _iFile, const char* _pstName)
 //it is actually impossible to really remove data from HDF5 file so unlink dataset to main group
 int deleteHDF5Var(int _iFile, const char* _pstName)
 {
-    herr_t status = 0;
+    int ret = 0;
     void *oldclientdata = NULL;
     H5E_auto2_t oldfunc;
 
@@ -2070,18 +2049,21 @@ int deleteHDF5Var(int _iFile, const char* _pstName)
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     //try to unlink potential subgroups
-    deleteHDF5group(_iFile, _pstName);
-
-    //delete current dataset link
-    status = H5Ldelete(_iFile, _pstName, H5P_DEFAULT);
-    if (status < 0)
+    ret = deleteHDF5group(_iFile, _pstName);
+    if (ret == -1)
     {
-        H5Eset_auto2(H5E_DEFAULT, oldfunc, oldclientdata);
-        return status;
+        ret = 0;
+        //delete current dataset link
+        hid_t status = H5Ldelete(_iFile, _pstName, H5P_DEFAULT);
+        if (status < 0)
+        {
+            H5Eset_auto2(H5E_DEFAULT, oldfunc, oldclientdata);
+            return -1;
+        }
     }
 
     H5Eset_auto2(H5E_DEFAULT, oldfunc, oldclientdata);
-    return 0;
+    return ret;
 }
 
 /*Scilab 6*/
index bbc1187..a4ec525 100644 (file)
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\cpp\hdf5_gw.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_export_to_hdf5.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_save.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_h5attr.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_h5close.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_h5cp.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_h5umount.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_h5write.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_file_version.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v1.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v3.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_is_hdf5_file.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5_v2.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5_v3.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v1.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v3.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_is_file.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar_v2.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar_v3.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_percent_H5Object_e.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_percent_H5Object_fieldnames.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_percent_H5Object_p.cpp" />
     <ClCompile Include="h5_readDataFromFile.c" />
     <ClCompile Include="h5_readDataFromFile_v1.c" />
     <ClCompile Include="h5_writeDataToFile.c" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v2.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v2.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_hdf5_scilab.h" />
     <ClInclude Include="..\..\includes\h5_readDataFromFile_v1.h" />
     <ClInclude Include="..\..\includes\HDF5Objects.h" />
     <ClInclude Include="..\..\includes\hdf5_gw.hxx" />
-    <ClInclude Include="..\..\includes\import_from_hdf5_v1.hxx" />
     <ClInclude Include="..\..\includes\gw_hdf5.h" />
     <ClInclude Include="..\..\includes\h5_attributeConstants.h" />
     <ClInclude Include="..\..\includes\h5_fileManagement.h" />
     <ClInclude Include="..\..\includes\h5_readDataFromFile.h" />
     <ClInclude Include="..\..\includes\h5_writeDataToFile.h" />
+    <ClInclude Include="..\..\includes\hdf5_load_v1.hxx" />
     <ClInclude Include="..\..\includes\listvar_in_hdf5_v1.hxx" />
     <ClInclude Include="..\cpp\H5ArrayData.hxx" />
     <ClInclude Include="..\cpp\H5Attribute.hxx" />
index c639f0d..1d111d8 100644 (file)
@@ -35,9 +35,6 @@
     <ClCompile Include="h5_writeDataToFile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_is_hdf5_file.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="h5_readDataFromFile_v1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\hdf5_gw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v3.cpp">
+    <ClCompile Include="..\cpp\handle_properties.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v2.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_file_version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_export_to_hdf5.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_save.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5_v2.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v1.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5_v3.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_listvar_in_hdf5.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_load_v3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cpp\handle_properties.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_is_file.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_file_version.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_import_from_hdf5_v1.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar_v2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_hdf5_listvar_v3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
     <ClInclude Include="..\..\includes\h5_readDataFromFile_v1.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\import_from_hdf5_v1.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\listvar_in_hdf5_v1.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\cpp\handle_properties.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\hdf5_load_v1.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
index 22770ce..0ce9fec 100644 (file)
@@ -13,9 +13,6 @@
 // <-- Short Description -->
 // 
 // save with two times the same name leads to an HDF5 error.
-x=123
- x  =
-    123.  
-assert_checkerror("export_to_hdf5(TMPDIR + ""toto"" ,""x"", ""x"")", [], 999);
-assert_checktrue(export_to_hdf5(TMPDIR + "bug_11954.sod", "x", "x", "-append"));
+x=123;
+assert_checktrue(execstr("save(TMPDIR + ""/toto"" ,""x"", ""x"")", "errcatch") == 0);
+assert_checktrue(execstr("save(TMPDIR + ""/bug_11954.sod"", ""x"", ""x"", ""-append"")", "errcatch") == 0);
index 9aa0197..096d2ff 100644 (file)
@@ -11,9 +11,9 @@
 // http://bugzilla.scilab.org/show_bug.cgi?id=11954
 //
 // <-- Short Description -->
-// 
+//
 // save with two times the same name leads to an HDF5 error.
 
-x=123
-assert_checkerror("export_to_hdf5(TMPDIR + ""toto"" ,""x"", ""x"")", [], 999);
-assert_checktrue(export_to_hdf5(TMPDIR + "bug_11954.sod", "x", "x", "-append"));
+x=123;
+assert_checktrue(execstr("save(TMPDIR + ""/toto"" ,""x"", ""x"")", "errcatch") == 0);
+assert_checktrue(execstr("save(TMPDIR + ""/bug_11954.sod"", ""x"", ""x"", ""-append"")", "errcatch") == 0);
index 0c50054..ea7400d 100644 (file)
 //
 // <-- Short Description -->
 // 
-// export_to_hdf5 function could not handle any matrix in append mode.
-savefile = TMPDIR + "bug_12285.sod";
+// save function could not handle any matrix in append mode.
+function checknoerror(str)
+    err = execstr(str, "errcatch");
+    assert_checktrue(err == 0);
+endfunction
+savefile = TMPDIR + "/bug_12285.sod";
 a_list = list(1,2,3);
 a_list_ref = a_list;
 a_string = "a string";
@@ -25,19 +29,29 @@ a_complex_num_ref = a_complex_num;
 an_array_multidim  = [1 2 3 4; 5 6 7 8; 9 10 11 12];
 an_array_multidim_ref = an_array_multidim;
 //save all variables in the same file
-assert_checktrue(export_to_hdf5(savefile, 'a_list', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'a_string', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'an_integer', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'a_complex_num', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'an_array_multidim', '-append'));
+err = execstr("save(savefile, ""a_list"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""a_string"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""an_integer"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""a_complex_num"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""an_array_multidim"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
 //clear variables
 clear a_list a_string an_integer an_array_multidim
 //load variables
-assert_checktrue(import_from_hdf5(savefile, 'a_list'));
-assert_checktrue(import_from_hdf5(savefile, 'a_string'));
-assert_checktrue(import_from_hdf5(savefile, 'an_integer'));
-assert_checktrue(import_from_hdf5(savefile, 'a_complex_num'));
-assert_checktrue(import_from_hdf5(savefile, 'an_array_multidim'));
+err = execstr("load(savefile, ""a_list"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""a_string"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""an_integer"")", "errcatch");;
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""a_complex_num"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""an_array_multidim"")", "errcatch");
+assert_checktrue(err == 0);
 //check variables values
 assert_checkequal(a_list, a_list_ref);
 assert_checkequal(a_string, a_string_ref);
@@ -47,7 +61,9 @@ assert_checkequal(an_array_multidim, an_array_multidim_ref);
 //append file with a already existing variable name but different data
 a_list = "ok ok i am not a list";
 a_list_ref = a_list;
-assert_checktrue(export_to_hdf5(savefile, 'a_list', '-append'));
+err = execstr("save(savefile, ""a_list"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
 clear a_list
-assert_checktrue(import_from_hdf5(savefile, 'a_list'));
+err = execstr("load(savefile, ""a_list"")", "errcatch");
+assert_checktrue(err == 0);
 assert_checkequal(a_list, a_list_ref);
index 4b40c5f..65ad982 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=12285
 //
 // <-- Short Description -->
-// 
-// export_to_hdf5 function could not handle any matrix in append mode.
+//
+// save function could not handle any matrix in append mode.
+
+function checknoerror(str)
+    err = execstr(str, "errcatch");
+    assert_checktrue(err == 0);
+endfunction
 
-savefile = TMPDIR + "bug_12285.sod";
+savefile = TMPDIR + "/bug_12285.sod";
 a_list = list(1,2,3);
 a_list_ref = a_list;
 
@@ -31,21 +36,31 @@ an_array_multidim  = [1 2 3 4; 5 6 7 8; 9 10 11 12];
 an_array_multidim_ref = an_array_multidim;
 
 //save all variables in the same file
-assert_checktrue(export_to_hdf5(savefile, 'a_list', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'a_string', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'an_integer', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'a_complex_num', '-append'));
-assert_checktrue(export_to_hdf5(savefile, 'an_array_multidim', '-append'));
+err = execstr("save(savefile, ""a_list"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""a_string"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""an_integer"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""a_complex_num"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("save(savefile, ""an_array_multidim"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
 
 //clear variables
 clear a_list a_string an_integer an_array_multidim
 
 //load variables
-assert_checktrue(import_from_hdf5(savefile, 'a_list'));
-assert_checktrue(import_from_hdf5(savefile, 'a_string'));
-assert_checktrue(import_from_hdf5(savefile, 'an_integer'));
-assert_checktrue(import_from_hdf5(savefile, 'a_complex_num'));
-assert_checktrue(import_from_hdf5(savefile, 'an_array_multidim'));
+err = execstr("load(savefile, ""a_list"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""a_string"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""an_integer"")", "errcatch");;
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""a_complex_num"")", "errcatch");
+assert_checktrue(err == 0);
+err = execstr("load(savefile, ""an_array_multidim"")", "errcatch");
+assert_checktrue(err == 0);
 
 //check variables values
 assert_checkequal(a_list, a_list_ref);
@@ -57,7 +72,9 @@ assert_checkequal(an_array_multidim, an_array_multidim_ref);
 //append file with a already existing variable name but different data
 a_list = "ok ok i am not a list";
 a_list_ref = a_list;
-assert_checktrue(export_to_hdf5(savefile, 'a_list', '-append'));
+err = execstr("save(savefile, ""a_list"", ""-append"")", "errcatch");
+assert_checktrue(err == 0);
 clear a_list
-assert_checktrue(import_from_hdf5(savefile, 'a_list'));
+err = execstr("load(savefile, ""a_list"")", "errcatch");
+assert_checktrue(err == 0);
 assert_checkequal(a_list, a_list_ref);
index 137f0db..268d797 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=5630
 //
 // <-- Short Description -->
-// 5629: export_to_hdf5 overwrites an empty directory without warning
-// 5630: export_to_hdf5 on an existing directory with file in it mess with the permissions.
+// 5629: hdf5_save overwrites an empty directory without warning
+// 5630: hdf5_save on an existing directory with file in it mess with the permissions.
 commonName = pathconvert(TMPDIR+"/bug_5629",%F);
 myvar      = 1;
 mkdir(commonName);
 if ~isdir(commonName) then bugmes();quit;end
-if ~execstr("export_to_hdf5(commonName,""myvar"")","errcatch") then bugmes();quit;end
+if ~execstr("save(commonName,""myvar"")","errcatch") then bugmes();quit;end
 if ~isdir(commonName) then bugmes();quit;end
 if isfile(commonName) then bugmes();quit;end
index 64e1aa8..bda63d3 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=5630
 //
 // <-- Short Description -->
-// 5629: export_to_hdf5 overwrites an empty directory without warning
-// 5630: export_to_hdf5 on an existing directory with file in it mess with the permissions.
+// 5629: hdf5_save overwrites an empty directory without warning
+// 5630: hdf5_save on an existing directory with file in it mess with the permissions.
 
 commonName = pathconvert(TMPDIR+"/bug_5629",%F);
 myvar      = 1;
 
 mkdir(commonName);
 if ~isdir(commonName) then pause,end
-if ~execstr("export_to_hdf5(commonName,""myvar"")","errcatch") then pause, end
+if ~execstr("save(commonName,""myvar"")","errcatch") then pause, end
 if ~isdir(commonName) then pause,end
 if isfile(commonName) then pause,end
index 12064fd..ed911de 100644 (file)
@@ -25,14 +25,14 @@ A = [1 2 3];
 B = [4 5 6];
 data = [A B];
 c1 = pwd();
-ierr = execstr("export_to_hdf5(dataFile, ''data'');","errcatch");
+ierr = execstr("save(dataFile, ''data'');","errcatch");
 c2 = pwd();
 if ierr <> 0 then bugmes();quit;end
 if c1 <> c2 then bugmes();quit;end
 if ~isfile(dataFile) then bugmes();quit;end
 clear data;
 c3 = pwd();
-ierr = execstr("import_from_hdf5(dataFile);","errcatch");
+ierr = execstr("load(dataFile);","errcatch");
 c4 = pwd();
 if ierr <> 0 then bugmes();quit;end
 if c3 <> c4 then bugmes();quit;end
index e9df728..f46f8f5 100644 (file)
@@ -16,9 +16,9 @@
 // xcos demos did not work and returned an error "Unable to open file".
 //
 
-dataDirP1 = TMPDIR + '/世界您好';
-dataDirP2 = TMPDIR + '/世界您好/JOSÉDO~1/';
-dataFile = dataDirP2 + '/my_data.sod';
+dataDirP1 = TMPDIR + "/世界您好";
+dataDirP2 = TMPDIR + "/世界您好/JOSÉDO~1/";
+dataFile = dataDirP2 + "/my_data.sod";
 
 mkdir(dataDirP1);
 mkdir(dataDirP2);
@@ -29,7 +29,7 @@ B = [4 5 6];
 
 data = [A B];
 c1 = pwd();
-ierr = execstr("export_to_hdf5(dataFile, ''data'');","errcatch");
+ierr = execstr("save(dataFile, ''data'');","errcatch");
 c2 = pwd();
 
 if ierr <> 0 then pause,end
@@ -39,7 +39,7 @@ if ~isfile(dataFile) then pause, end
 clear data;
 
 c3 = pwd();
-ierr = execstr("import_from_hdf5(dataFile);","errcatch");
+ierr = execstr("load(dataFile);","errcatch");
 c4 = pwd();
 
 if ierr <> 0 then pause,end
index ffce1e8..2d220b1 100644 (file)
@@ -14,8 +14,7 @@
 // <-- Short Description -->
 // HDF5 functions don't unlock file wih empty matrix.
 //
-importScicosDiagram("SCI/modules/hdf5/tests/nonreg_tests/bug_7224.cos");
 emp=[];         // or list([]), scicos_diagram(), etc.
-export_to_hdf5(TMPDIR + "/emp.sod","emp");
-import_from_hdf5(TMPDIR + "/emp.sod");
-if execstr("export_to_hdf5(TMPDIR + ""/emp.sod"",""emp"");","errcatch") then bugmes();quit;end
+save(TMPDIR + "/emp.sod","emp");
+load(TMPDIR + "/emp.sod");
+if execstr("save(TMPDIR + ""/emp.sod"",""emp"");","errcatch") then bugmes();quit;end
index 53469cc..5a9510b 100644 (file)
@@ -16,9 +16,7 @@
 // HDF5 functions don't unlock file wih empty matrix.
 //
 
-importScicosDiagram("SCI/modules/hdf5/tests/nonreg_tests/bug_7224.cos");
-
 emp=[];         // or list([]), scicos_diagram(), etc.
-export_to_hdf5(TMPDIR + "/emp.sod","emp");
-import_from_hdf5(TMPDIR + "/emp.sod");
-if execstr("export_to_hdf5(TMPDIR + ""/emp.sod"",""emp"");","errcatch") then pause, end
+save(TMPDIR + "/emp.sod","emp");
+load(TMPDIR + "/emp.sod");
+if execstr("save(TMPDIR + ""/emp.sod"",""emp"");","errcatch") then pause, end
index 75564e8..1a30e58 100644 (file)
@@ -14,5 +14,5 @@
 // <-- Short Description -->
 // Check format of HDF5 file
 //
-ierr = execstr("import_from_hdf5(SCI + ""/modules/hdf5/tests/nonreg_tests/bug_8170.sod"")", "errcatch");
+ierr = execstr("load(SCI + ""/modules/hdf5/tests/nonreg_tests/bug_8170.sod"")", "errcatch");
 if ierr == 0 then bugmes();quit;end
index da4bda9..28e08a9 100644 (file)
@@ -16,5 +16,5 @@
 // Check format of HDF5 file
 //
 
-ierr = execstr("import_from_hdf5(SCI + ""/modules/hdf5/tests/nonreg_tests/bug_8170.sod"")", "errcatch");
+ierr = execstr("load(SCI + ""/modules/hdf5/tests/nonreg_tests/bug_8170.sod"")", "errcatch");
 if ierr == 0 then pause, end
index 7d427bc..4956380 100644 (file)
 //list(1, undef, 3)
 list_undefined = list(1);
 list_undefined(3) = 3;
-export_to_hdf5(TMPDIR + "/list_undefined1.sod", "list_undefined");
+save(TMPDIR + "/list_undefined1.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined1.sod");
+load(TMPDIR + "/list_undefined1.sod");
 if or(definedfields(list_undefined) == 2) == %t then bugmes();quit;end
 //list(undef, 3)
 list_undefined = list(1);
 list_undefined(3) = 3;
 list_undefined(1) = null();
-export_to_hdf5(TMPDIR + "/list_undefined2.sod", "list_undefined");
+save(TMPDIR + "/list_undefined2.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined2.sod");
+load(TMPDIR + "/list_undefined2.sod");
 if or(definedfields(list_undefined) == 1) == %t then bugmes();quit;end
 //list(1, undef)
 list_undefined = list(1);
 list_undefined(3) = 3;
 list_undefined(3) = null();
-export_to_hdf5(TMPDIR + "/list_undefined3.sod", "list_undefined");
+save(TMPDIR + "/list_undefined3.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined3.sod");
+load(TMPDIR + "/list_undefined3.sod");
 if or(definedfields(list_undefined) == 2) == %t then bugmes();quit;end
 //void test
 //list(1, void, 3)
 list_void = list(1,,3);
-export_to_hdf5(TMPDIR + "/list_void1.sod", "list_void");
+save(TMPDIR + "/list_void1.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void1.sod");
+load(TMPDIR + "/list_void1.sod");
 if type(list_void(2)) <> 0 then bugmes();quit;end
 //list(void, 3)
 list_void = list(,2);
-export_to_hdf5(TMPDIR + "/list_void2.sod", "list_void");
+save(TMPDIR + "/list_void2.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void2.sod");
+load(TMPDIR + "/list_void2.sod");
 if type(list_void(1)) <> 0 then bugmes();quit;end
 //list(1, void)
 list_void = list(1,);
-export_to_hdf5(TMPDIR + "/list_void3.sod", "list_void");
+save(TMPDIR + "/list_void3.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void3.sod");
+load(TMPDIR + "/list_void3.sod");
 if type(list_void(2)) <> 0 then bugmes();quit;end
index e1c0bd0..c7e4094 100644 (file)
@@ -22,9 +22,9 @@
 
 list_undefined = list(1);
 list_undefined(3) = 3;
-export_to_hdf5(TMPDIR + "/list_undefined1.sod", "list_undefined");
+save(TMPDIR + "/list_undefined1.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined1.sod");
+load(TMPDIR + "/list_undefined1.sod");
 if or(definedfields(list_undefined) == 2) == %t then pause, end
 
 //list(undef, 3)
@@ -32,9 +32,9 @@ if or(definedfields(list_undefined) == 2) == %t then pause, end
 list_undefined = list(1);
 list_undefined(3) = 3;
 list_undefined(1) = null();
-export_to_hdf5(TMPDIR + "/list_undefined2.sod", "list_undefined");
+save(TMPDIR + "/list_undefined2.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined2.sod");
+load(TMPDIR + "/list_undefined2.sod");
 if or(definedfields(list_undefined) == 1) == %t then pause, end
 
 
@@ -43,9 +43,9 @@ if or(definedfields(list_undefined) == 1) == %t then pause, end
 list_undefined = list(1);
 list_undefined(3) = 3;
 list_undefined(3) = null();
-export_to_hdf5(TMPDIR + "/list_undefined3.sod", "list_undefined");
+save(TMPDIR + "/list_undefined3.sod", "list_undefined");
 clear list_undefined;
-import_from_hdf5(TMPDIR + "/list_undefined3.sod");
+load(TMPDIR + "/list_undefined3.sod");
 if or(definedfields(list_undefined) == 2) == %t then pause, end
 
 //void test
@@ -54,25 +54,25 @@ if or(definedfields(list_undefined) == 2) == %t then pause, end
 //list(1, void, 3)
 
 list_void = list(1,,3);
-export_to_hdf5(TMPDIR + "/list_void1.sod", "list_void");
+save(TMPDIR + "/list_void1.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void1.sod");
+load(TMPDIR + "/list_void1.sod");
 if type(list_void(2)) <> 0 then pause, end
 
 
 //list(void, 3)
 
 list_void = list(,2);
-export_to_hdf5(TMPDIR + "/list_void2.sod", "list_void");
+save(TMPDIR + "/list_void2.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void2.sod");
+load(TMPDIR + "/list_void2.sod");
 if type(list_void(1)) <> 0 then pause, end
 
 //list(1, void)
 
 list_void = list(1,);
-export_to_hdf5(TMPDIR + "/list_void3.sod", "list_void");
+save(TMPDIR + "/list_void3.sod", "list_void");
 clear list_void;
-import_from_hdf5(TMPDIR + "/list_void3.sod");
+load(TMPDIR + "/list_void3.sod");
 if type(list_void(2)) <> 0 then pause, end
 
index 2df8df8..ee1890b 100644 (file)
 // <-- Short Description -->
 // export does not return %f when try to export unmanaged data types.
 //
-deff('y=f(x)','y=2*x');
-if export_to_hdf5(TMPDIR+"/functions.sod","f") <> %f then pause end
-if ls(TMPDIR+"/functions.sod") <> [] then pause end
+A = sparse( [ 2  3  0  0  0;
+              3  0  4  0  6;
+              0 -1 -3  2  0;
+              0  0  1  0  0;
+              0  4  2  0  1] );
+b = [8 ; 45; -3; 3; 19];
+lusparse = umf_lufact(A);
+err = execstr("save(TMPDIR + ""/lusparse.sod"",""lusparse"")", "errcatch");
+assert_checktrue(err <> 0);
+if ls(TMPDIR+"/lusparse.sod") <> [] then pause end
index a06f3dc..a61bb0c 100644 (file)
 // export does not return %f when try to export unmanaged data types.
 //
 
+A = sparse( [ 2  3  0  0  0;
+3  0  4  0  6;
+0 -1 -3  2  0;
+0  0  1  0  0;
+0  4  2  0  1] );
+b = [8 ; 45; -3; 3; 19];
+lusparse = umf_lufact(A);
 
-deff('y=f(x)','y=2*x');
-if export_to_hdf5(TMPDIR+"/functions.sod","f") <> %f then pause end
-if ls(TMPDIR+"/functions.sod") <> [] then pause end
+err = execstr("save(TMPDIR + ""/lusparse.sod"",""lusparse"")", "errcatch");
+assert_checktrue(err <> 0);
+if ls(TMPDIR+"/lusparse.sod") <> [] then pause end
index fa3c73c..9ad93fe 100644 (file)
@@ -6,8 +6,8 @@
 // =============================================================================
 //
 // <-- Short Description -->
-// If the input of import_from_hdf5 was a matrix of string, a segfault occurred
+// If the input of load was a matrix of string, a segfault occurred
 //
 myFiles=ls(SCI+"/modules/types/tests/java/org/scilab/tests/modules/types/referenceData/*");
 // Used to segfault
-assert_checkerror("import_from_hdf5(myFiles)",[],999);
+assert_checkerror("load(myFiles)",[],999);
index d1da83c..b66201d 100644 (file)
@@ -6,9 +6,9 @@
 // =============================================================================
 //
 // <-- Short Description -->
-// If the input of import_from_hdf5 was a matrix of string, a segfault occurred
+// If the input of load was a matrix of string, a segfault occurred
 //
 
 myFiles=ls(SCI+"/modules/types/tests/java/org/scilab/tests/modules/types/referenceData/*");
 // Used to segfault
-assert_checkerror("import_from_hdf5(myFiles)",[],999);
+assert_checkerror("load(myFiles)",[],999);
diff --git a/scilab/modules/hdf5/tests/unit_tests/exportImportHdf5.dia.ref b/scilab/modules/hdf5/tests/unit_tests/exportImportHdf5.dia.ref
deleted file mode 100644 (file)
index 31177ed..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2014 - Scilab Enterprises - Vladislav TRUBKIN
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-//
-// check function
-clear "checkValue";
-function checkValue(value)
-    clear "varName";
-    varName = value;
-    fileName = TMPDIR + "/exportImportHdf5.sod";
-    // export to hdf5
-    oldVarName = varName;
-    assert_checkequal(export_to_hdf5(fileName, "varName"), %t);
-    // check that the "varName" has not been modified by export
-    assert_checkequal(oldVarName, varName);
-    // reset ref value
-    clear "varName" "oldVarName";
-    assert_checkequal(exists("varName"), 0);
-    // import from hdf5
-    assert_checkequal(import_from_hdf5(fileName), %t);
-    assert_checkequal(varName, value);
-endfunction
-//// Empty matrix
-checkValue([]);
-//// Double
-// scalar
-checkValue(77);
-// vector
-checkValue([1, 2, 3, 4, 5]);
-checkValue([1; 2; 3; 4; 5]);
-// matrix
-checkValue([1, 2, 3; 4, 5, 6]);
-//// Double complex
-// scalar
-checkValue(1 + %i*2);
-// vector
-checkValue([1 + %i, 2 + %i, 3 + %i*2, 4 + %i*3, 5 + %i*4]);
-checkValue([1 + %i; 2 + %i; 3 + %i*2; 4 + %i*3; 5 + %i*4]);
-// matrix
-checkValue([1 + %i, 2 + %i, 3 + %i*2; 4 + %i*3, 5 + %i*4, 6 + %i]);
-//// String
-// single
-checkValue("Single String");
-// vector
-checkValue(["a", "b", "c"]);
-checkValue(["a"; "b"; "c"]);
-// matrix
-checkValue(["a", "b", "c"; "d", "e", "f"]);
-//// Polynomials
-s = poly(0, "s");
-// single
-checkValue(poly([1, 2], "s", "c"));
-// vector
-checkValue([s, s^2, 1 + 3*s^2, 1 + 2*s + 4*s^3]);
-checkValue([s; s^2; 1 + 3*s^2; 1 + 2*s + 4*s^3]);
-// matrix
-checkValue([s, s^2; 1 + 3*s^2, 1 + 2*s + 4*s^3]);
-//// Boolean
-// single
-checkValue(%t);
-// vector
-checkValue([%t, %t, %f, %t, %t]);
-checkValue([%t; %t; %f; %t; %t]);
-// matrix
-checkValue([%t, %t; %f, %f]);
-//// Integer
-clear "createIntValues";
-function intValues = createIntValues(value, flag)
-    select flag
-    case 8 // int8
-        intValues = int8(value);
-        break;
-    case -8 // uint8
-        intValues = uint8(value);
-        break;
-    case 16
-        intValues = int16(value);
-        break;
-    case -16
-        intValues = uint16(value);
-        break;
-    case 32
-        intValues = int32(value);
-        break;
-    case -32
-        intValues = uint32(value);
-        break;
-    end
-endfunction
-clear "checkIntValue";
-function checkIntValue(refValue, flag)
-    for i = 1:6
-        checkValue(createIntValues(refValue, flag(i)));
-    end
-endfunction
-// all flags for createIntValues
-flag = [8, -8, 16, -16, 32, -32];
-// scalar
-checkIntValue(5, flag);
-// vector
-checkIntValue([1, 2, 3, 4, 5], flag);
-checkIntValue([1, 2, 3, 4, 5]', flag);
-// matrix
-checkIntValue([1, 2, 3; 4, 5, 6], flag);
-//// Sparse
-checkValue(sparse([1, 2; 4, 5; 3, 10], [1, 2, 3]));
-checkValue(sparse([1, 2; 4, 5; 3, 10], [1 + %i, 2 + 2*%i, 3 + 3*%i]));
-//// Boolean sparse
-valueRef = [%F, %F, %T, %F, %F
-%T, %F, %F, %F, %F
-%F, %F, %F, %F, %F
-%F, %F, %F, %F, %T];
-checkValue(sparse(valueRef));
-checkValue(sparse([1, 1; 2, 2; 3, 3; 4, 4], [%t, %t, %t, %t]));
-//// List
-listNew = list();
-// empty list
-checkValue(listNew);
-// double in list
-listNew(1) = 111;
-listNew(2) = [1, 2, 3];
-listNew(3) = [1, 2, 3]';
-// string in list
-listNew(4) = ["a", "b"; "c", "d"];
-// double complex in list
-listNew(5) = [complex(1, 2), complex(1, 3); complex(1, 4), complex(1, 5)];
-// boolean in list
-listNew(6) = [%t, %t, %t; %f, %f, %f];
-// integer in list
-valueRef = ones(4, 3);
-for i = 7:12
-    listNew(i) = createIntValues(valueRef, flag(i - 6));
-end
-// polynom in list
-listNew(13) = [s, s^2; 1 + 3*s^2, 1 + 2*s + 4*s^3];
-// empty matrix in list
-listNew(14) = [];
-checkValue(listNew);
-// list in list
-listNew = list();
-listNew(1) = 111;
-listNew(2) = list([1, 2, 3]);
-valueRef = ones(4, 3);
-for i = 3:8
-    listNew(i) = list(createIntValues(valueRef, flag(i - 2)));
-end
-listNew(9) = list(string([1, 2, 3; 4, 5, 6]));
-listNew(10) = list([%f, %f; %t, %t]);
-checkValue(listNew);
-// nested list
-listNew2 = list(listNew, listNew, list("Scilab", 7, %t));
-checkValue(listNew2);
-// tlist and mlist in the list
-tlstRef = tlist(["random numbers"; "Name"; "Example"; "Example_2"], "Uniform", [%f, %t; %f, %t], [1, 2; 3, 4]);
-mlstRef = mlist(["V", "name", "value"], ["a", "b"; "c", "d"], [1, 2; 3, 4]);
-listNew = list("only one mlist", mlstRef);
-checkValue(listNew);
-listNew = list("only one tlist", tlstRef);
-checkValue(listNew);
-listNew = list(["mlist", "and", "tlist"], mlstRef, tlstRef);
-checkValue(listNew);
-// sparse in the list
-listNew = list(sparse([1, 2; 4, 5; 3, 10], [1, 2, 3]), ...
-sparse([1, 1; 2, 2; 3, 3; 4, 4], [%t, %t, %t, %t]), ...
-sparse([1, 2; 4, 5; 3, 10], [1 + %i, 2 + 2*%i, 3 + 3*%i]));
-//// Tlist
-valueRef = ones(2, 2);
-lstRef = tlist(["TLIST";
-"String";
-"Double";
-"DoubleCplx";
-"Int";
-"Bool"], ["A", "B"; "C", "D"], valueRef, ...
-complex(valueRef, 2), createIntValues(valueRef, 16), ...
-[%f, %t; %f, %t]);
-checkValue(lstRef);
-// hypermatrix in tlist
-lstRef = tlist(["hmInTlist";
-"Name";
-"Example_1"
-"Example_2"], "List", ones(1, 2, 3), hypermat([2 2 1 2], (1:8) == 0));
-checkValue(lstRef);
-// tlist in tlist
-lstRef = tlist(["tlistInTlist";
-"Name";
-"Tlist";
-"Poly";
-"List"], "List", lstRef, poly([1, 2], "s", "c"), list(1, %t));
-checkValue(lstRef);
-//// Mlist
-lstRef = mlist(["MLIST", "Name", "Value"], ["a", "b"; "c", "d"], [1, 2; 3, 4]);
-checkValue(lstRef);
-lstRef = mlist(["MLIST";
-"String";
-"Double";
-"DoubleCplx";
-"Int";
-"Bool"], ["A", "B"; "C", "D"], valueRef, ...
-complex(valueRef, 2), createIntValues(valueRef, 8), ...
-[%f, %t; %f, %t]);
-checkValue(lstRef);
-// hypermatrix in mlist
-lstRef = mlist(["hmInMlist";
-"Name";
-"Example_1"
-"Example_2"], "List", ones(1, 2, 3), hypermat([2 2 1 2], (1:8) == 0));
-checkValue(lstRef);
-//// Hypermatrix
-// double
-checkValue(ones(1, 2, 3, 4));
-checkValue(complex(ones(1, 2, 3, 4), 2));
-checkValue(rand(3, 3));
-// integer
-for i = flag
-    checkValue(createIntValues(ones(1, 2, 3, 4), i));
-end
-// boolean
-checkValue(hypermat([2 2 1 2],(1:8) == 0));
-//// Undefined
-valueRef = list(1, "two", "three");
-valueRef(5) = "five";
-valueRef(7) = 7;
-checkValue(valueRef);
-//// Void
-l = list(1, , 3);
-// l == l return [%t %f %t],
-// we can't use assertcheck_equal(computed, expected)
-fileName = TMPDIR + "/exportImportHdf5.sod";
-// export to hdf5
-old_l = l;
-assert_checktrue(export_to_hdf5(fileName, "l"));
-// check that the "l" has not been modified by export
-assert_checkequal(old_l == l, [%t %f %t]);
-// reset ref value
-clear l old_l
-assert_checktrue(exists("l")==0);
-// import from hdf5
-assert_checktrue(import_from_hdf5(fileName));
-assert_checkequal(l == list(1, , 3), [%t %f %t]);
-// Struct
-data.data.data = 0;
-data.data.string = "Scilab";
-data.list = list(1,["S" "E"]);
-checkValue(data);
-data2.data.data = 42;
-data2.data.string = "Test";
-data2.list = list(1,["a" "b"]);
-checkValue(data2);
-struct_ = [data, data, data2; data2, data2, data];
-checkValue(struct_);
-emptyStruct = struct();
-checkValue(emptyStruct);
-// Cell
-Cell_ = cell(2,2,2);
-Cell_{1} = "scilab";
-Cell_{2} = 42;
-Cell_{3} = list(1,["a" "b"]);
-Cell_{4} = int8(2);
-Cell_{5} = 5;
-Cell_{6} = 6;
-Cell_{7} = poly(1:3,"s");
-Cell_{8} = "Yasp";
-checkValue(Cell_);
-emptyCell = cell();
-checkValue(emptyCell);
index 59ec232..8c2e4e0 100644 (file)
 
 
 ///// Empty matrix
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/emptymatrix.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/emptymatrix.sod");
 assert_checkequal(emptymatrix, []);
 
 ///// Double
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar.sod");
 assert_checkequal(ascalar,42);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble.sod");
 assert_checkequal(a,[2,3;4,5]);
 
 
 ///// Double complex
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex.sod");
 assert_checkequal(b,[2+%i,3+%i*2;4+%i*%pi,5]);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar.sod");
 assert_checkequal(bscalar,42+%i);
 
 
 ///// String
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring.sod");
 assert_checkequal(c,["my matrix","of strings";"is","saved in Scilab data format"]);
-  
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar.sod");
+
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar.sod");
 assert_checkequal(cscalar,["my single string"]);
 
 // Polynomials
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials.sod");
-p_reference=poly([1 2],'s') ;
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials.sod");
+p_reference=poly([1 2],"s") ;
 assert_checkequal(p,p_reference);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef.sod");
-q_reference=poly([1 42],'s','c');
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef.sod");
+q_reference=poly([1 42],"s","c");
 assert_checkequal(q,q_reference);
 
 
 // Boolean matrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar.sod");
 assert_checkequal(bm,%t);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix.sod");
 assert_checkequal(bmm,[%t,%f; %f, %t]);
 
 // Sparse
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix.sod");
 assert_checkequal(sp,sparse([1,2;4,5;3,10],[1,2,3]));
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse.sod");
 assert_checkequal(emptysparse,sparse([]));
 
 // boolean sparse
@@ -66,32 +66,32 @@ dense=[%F, %F, %T, %F, %F
 %F, %F, %F, %F, %F
 %F, %F, %F, %F, %T];
 sp_reference=sparse(dense);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse.sod");
 assert_checkequal(sp,sp_reference);
 
 // List
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/list.sod");
-assert_checkequal(ls,list(2,%i,'f',ones(3,3)));
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/list.sod");
+assert_checkequal(ls,list(2,%i,"f",ones(3,3)));
 ls(2) =  list( %t, [32,42]); // alter ls to add the list
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested.sod");
 assert_checkequal(lsnested,ls);
 
 // tlist
-lst_reference  =  tlist(['random numbers';'Name';'Example'], 'Uniform',ones(1,2, 3));
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist.sod");
+lst_reference  =  tlist(["random numbers";"Name";"Example"], "Uniform",ones(1,2, 3));
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist.sod");
 assert_checkequal(lst,lst_reference);
 
 // mlist
-M_ref=mlist(['V','name','value'],['a','b';'c' 'd'],[1 2; 3 4]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist.sod");
+M_ref=mlist(["V","name","value"],["a","b";"c" "d"],[1 2; 3 4]);
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist.sod");
 // Commented because of bug 9531
 //assert_checkequal(M_ref,M);
 
 // hypermatrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix.sod");
 assert_checkequal(HM,hypermat([2 3 2 2],1:24));
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex.sod");
 HMC_reference(1,1,1,1:2)=[1+%i 2*2*%i];
 assert_checkequal(HMC,HMC_reference);
 
@@ -102,7 +102,7 @@ int8scalar_ref = int8(1);
 int8rowvector_ref = int8([1 -4 7]);
 int8colvector_ref = int8([1;-4;7]);
 int8matrix_ref = int8([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int8.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int8.sod");
 assert_checkequal(emptyint8matrix, emptyint8matrix_ref);
 assert_checkequal(int8scalar, int8scalar_ref);
 assert_checkequal(int8rowvector, int8rowvector_ref);
@@ -115,7 +115,7 @@ int16scalar_ref = int16(1);
 int16rowvector_ref = int16([1 -4 7]);
 int16colvector_ref = int16([1;-4;7]);
 int16matrix_ref = int16([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int16.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int16.sod");
 assert_checkequal(emptyint16matrix, emptyint16matrix_ref);
 assert_checkequal(int16scalar, int16scalar_ref);
 assert_checkequal(int16rowvector, int16rowvector_ref);
@@ -128,7 +128,7 @@ int32scalar_ref = int32(1);
 int32rowvector_ref = int32([1 -4 7]);
 int32colvector_ref = int32([1;-4;7]);
 int32matrix_ref = int32([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int32.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int32.sod");
 assert_checkequal(emptyint32matrix, emptyint32matrix_ref);
 assert_checkequal(int32scalar, int32scalar_ref);
 assert_checkequal(int32rowvector, int32rowvector_ref);
@@ -141,7 +141,7 @@ uint8scalar_ref = uint8(1);
 uint8rowvector_ref = uint8([1 4 7]);
 uint8colvector_ref = uint8([1;4;7]);
 uint8matrix_ref = uint8([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8.sod");
 assert_checkequal(emptyuint8matrix, emptyuint8matrix_ref);
 assert_checkequal(uint8scalar, uint8scalar_ref);
 assert_checkequal(uint8rowvector, uint8rowvector_ref);
@@ -154,7 +154,7 @@ uint16scalar_ref = uint16(1);
 uint16rowvector_ref = uint16([1 4 7]);
 uint16colvector_ref = uint16([1;4;7]);
 uint16matrix_ref = uint16([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16.sod");
 assert_checkequal(emptyuint16matrix, emptyuint16matrix_ref);
 assert_checkequal(uint16scalar, uint16scalar_ref);
 assert_checkequal(uint16rowvector, uint16rowvector_ref);
@@ -167,7 +167,7 @@ uint32scalar_ref = uint32(1);
 uint32rowvector_ref = uint32([1 4 7]);
 uint32colvector_ref = uint32([1;4;7]);
 uint32matrix_ref = uint32([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32.sod");
 assert_checkequal(emptyuint32matrix, emptyuint32matrix_ref);
 assert_checkequal(uint32scalar, uint32scalar_ref);
 assert_checkequal(uint32rowvector, uint32rowvector_ref);
@@ -176,15 +176,15 @@ assert_checkequal(uint32matrix, uint32matrix_ref);
 
 
 // undefined
-undefinedelement_ref=list(2,%i,'f',ones(3,3));
+undefinedelement_ref=list(2,%i,"f",ones(3,3));
 undefinedelement_ref(6)="toto";
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement.sod");
 assert_checkequal(undefinedelement, undefinedelement_ref);
 
 
 // void
 voidelement_ref=list(1,,3);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement.sod");
 // Commented because of bug 9529
 //assert_checkequal(voidelement, voidelement_ref);
 
index 3775657..b99638f 100644 (file)
@@ -7,36 +7,36 @@
 // <-- CLI SHELL MODE -->
 // Load previously saved data (check backward compatibility)
 ///// Double
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar_v1.sod");
 assert_checkequal(ascalar,42);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble_v1.sod");
 assert_checkequal(a,[2,3;4,5]);
 ///// Double complex
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex_v1.sod");
 assert_checkequal(b,[2+%i,3+%i*2;4+%i*%pi,5]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar_v1.sod");
 assert_checkequal(bscalar,42+%i);
 ///// String
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring_v1.sod");
 assert_checkequal(c,["my matrix","of strings";"is","saved in Scilab data format"]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar_v1.sod");
 assert_checkequal(cscalar,["my single string"]);
 // Polynomials
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials_v1.sod");
 p_reference=poly([1 2],'s') ;
 assert_checkequal(p,p_reference);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef_v1.sod");
 q_reference=poly([1 42],'s','c');
 assert_checkequal(q,q_reference);
 // Boolean matrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar_v1.sod");
 assert_checkequal(bm,%t);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix_v1.sod");
 assert_checkequal(bmm,[%t,%f; %f, %t]);
 // Sparse
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix_v1.sod");
 assert_checkequal(sp,sparse([1,2;4,5;3,10],[1,2,3]));
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse_v1.sod");
 assert_checkequal(emptysparse,sparse([]));
 // boolean sparse
 dense=[%F, %F, %T, %F, %F
@@ -44,27 +44,27 @@ dense=[%F, %F, %T, %F, %F
 %F, %F, %F, %F, %F
 %F, %F, %F, %F, %T];
 sp_reference=sparse(dense);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse_v1.sod");
 assert_checkequal(sp,sp_reference);
 // List
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/list_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/list_v1.sod");
 assert_checkequal(ls,list(2,%i,'f',ones(3,3)));
 ls(2) =  list( %t, [32,42]); // alter ls to add the list
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested_v1.sod");
 assert_checkequal(lsnested,ls);
 // tlist
 lst_reference  =  tlist(['random numbers';'Name';'Example'], 'Uniform',ones(1,2, 3));
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist_v1.sod");
 assert_checkequal(lst,lst_reference);
 // mlist
 M_ref=mlist(['V','name','value'],['a','b';'c' 'd'],[1 2; 3 4]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist_v1.sod");
 // Commented because of bug 9531
 //assert_checkequal(M_ref,M);
 // hypermatrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix_v1.sod");
 assert_checkequal(HM,hypermat([2 3 2 2],1:24));
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex_v1.sod");
 HMC_reference(1,1,1,1:2)=[1+%i 2*2*%i];
 assert_checkequal(HMC,HMC_reference);
 // int
@@ -73,7 +73,7 @@ int8scalar_ref = int8(1);
 int8rowvector_ref = int8([1 -4 7]);
 int8colvector_ref = int8([1;-4;7]);
 int8matrix_ref = int8([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int8_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int8_v1.sod");
 assert_checkequal(emptyint8matrix, emptyint8matrix_ref);
 assert_checkequal(int8scalar, int8scalar_ref);
 assert_checkequal(int8rowvector, int8rowvector_ref);
@@ -84,7 +84,7 @@ int16scalar_ref = int16(1);
 int16rowvector_ref = int16([1 -4 7]);
 int16colvector_ref = int16([1;-4;7]);
 int16matrix_ref = int16([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int16_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int16_v1.sod");
 assert_checkequal(emptyint16matrix, emptyint16matrix_ref);
 assert_checkequal(int16scalar, int16scalar_ref);
 assert_checkequal(int16rowvector, int16rowvector_ref);
@@ -95,7 +95,7 @@ int32scalar_ref = int32(1);
 int32rowvector_ref = int32([1 -4 7]);
 int32colvector_ref = int32([1;-4;7]);
 int32matrix_ref = int32([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int32_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int32_v1.sod");
 assert_checkequal(emptyint32matrix, emptyint32matrix_ref);
 assert_checkequal(int32scalar, int32scalar_ref);
 assert_checkequal(int32rowvector, int32rowvector_ref);
@@ -106,7 +106,7 @@ uint8scalar_ref = uint8(1);
 uint8rowvector_ref = uint8([1 4 7]);
 uint8colvector_ref = uint8([1;4;7]);
 uint8matrix_ref = uint8([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8_v1.sod");
 assert_checkequal(emptyuint8matrix, emptyuint8matrix_ref);
 assert_checkequal(uint8scalar, uint8scalar_ref);
 assert_checkequal(uint8rowvector, uint8rowvector_ref);
@@ -117,7 +117,7 @@ uint16scalar_ref = uint16(1);
 uint16rowvector_ref = uint16([1 4 7]);
 uint16colvector_ref = uint16([1;4;7]);
 uint16matrix_ref = uint16([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16_v1.sod");
 assert_checkequal(emptyuint16matrix, emptyuint16matrix_ref);
 assert_checkequal(uint16scalar, uint16scalar_ref);
 assert_checkequal(uint16rowvector, uint16rowvector_ref);
@@ -128,7 +128,7 @@ uint32scalar_ref = uint32(1);
 uint32rowvector_ref = uint32([1 4 7]);
 uint32colvector_ref = uint32([1;4;7]);
 uint32matrix_ref = uint32([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32_v1.sod");
 assert_checkequal(emptyuint32matrix, emptyuint32matrix_ref);
 assert_checkequal(uint32scalar, uint32scalar_ref);
 assert_checkequal(uint32rowvector, uint32rowvector_ref);
@@ -137,10 +137,10 @@ assert_checkequal(uint32matrix, uint32matrix_ref);
 // undefined
 undefinedelement_ref=list(2,%i,'f',ones(3,3));
 undefinedelement_ref(6)="toto";
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement_v1.sod");
 assert_checkequal(undefinedelement, undefinedelement_ref);
 // void
 voidelement_ref=list(1,,3);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement_v1.sod");
 // Commented because of bug 9529
 //assert_checkequal(voidelement, voidelement_ref);
index 89e3e73..e1dabf9 100644 (file)
 
 
 ///// Double
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublescalar_v1.sod");
 assert_checkequal(ascalar,42);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedouble_v1.sod");
 assert_checkequal(a,[2,3;4,5]);
 
 
 ///// Double complex
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplex_v1.sod");
 assert_checkequal(b,[2+%i,3+%i*2;4+%i*%pi,5]);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricedoublecomplexscalar_v1.sod");
 assert_checkequal(bscalar,42+%i);
 
 
 ///// String
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestring_v1.sod");
 assert_checkequal(c,["my matrix","of strings";"is","saved in Scilab data format"]);
-  
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar_v1.sod");
+
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/matricestringscalar_v1.sod");
 assert_checkequal(cscalar,["my single string"]);
 
 // Polynomials
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials_v1.sod");
-p_reference=poly([1 2],'s') ;
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomials_v1.sod");
+p_reference=poly([1 2],"s") ;
 assert_checkequal(p,p_reference);
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef_v1.sod");
-q_reference=poly([1 42],'s','c');
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/polynomialscoef_v1.sod");
+q_reference=poly([1 42],"s","c");
 assert_checkequal(q,q_reference);
 
 
 // Boolean matrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanscalar_v1.sod");
 assert_checkequal(bm,%t);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleanmatrix_v1.sod");
 assert_checkequal(bmm,[%t,%f; %f, %t]);
 
 // Sparse
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/sparsematrix_v1.sod");
 assert_checkequal(sp,sparse([1,2;4,5;3,10],[1,2,3]));
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/emptysparse_v1.sod");
 assert_checkequal(emptysparse,sparse([]));
 
 // boolean sparse
@@ -62,32 +62,32 @@ dense=[%F, %F, %T, %F, %F
 %F, %F, %F, %F, %F
 %F, %F, %F, %F, %T];
 sp_reference=sparse(dense);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/booleansparse_v1.sod");
 assert_checkequal(sp,sp_reference);
 
 // List
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/list_v1.sod");
-assert_checkequal(ls,list(2,%i,'f',ones(3,3)));
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/list_v1.sod");
+assert_checkequal(ls,list(2,%i,"f",ones(3,3)));
 ls(2) =  list( %t, [32,42]); // alter ls to add the list
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/listnested_v1.sod");
 assert_checkequal(lsnested,ls);
 
 // tlist
-lst_reference  =  tlist(['random numbers';'Name';'Example'], 'Uniform',ones(1,2, 3));
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist_v1.sod");
+lst_reference  =  tlist(["random numbers";"Name";"Example"], "Uniform",ones(1,2, 3));
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/tlist_v1.sod");
 assert_checkequal(lst,lst_reference);
 
 // mlist
-M_ref=mlist(['V','name','value'],['a','b';'c' 'd'],[1 2; 3 4]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist_v1.sod");
+M_ref=mlist(["V","name","value"],["a","b";"c" "d"],[1 2; 3 4]);
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/mlist_v1.sod");
 // Commented because of bug 9531
 //assert_checkequal(M_ref,M);
 
 // hypermatrices
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrix_v1.sod");
 assert_checkequal(HM,hypermat([2 3 2 2],1:24));
 
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/hypermatrixcomplex_v1.sod");
 HMC_reference(1,1,1,1:2)=[1+%i 2*2*%i];
 assert_checkequal(HMC,HMC_reference);
 
@@ -98,7 +98,7 @@ int8scalar_ref = int8(1);
 int8rowvector_ref = int8([1 -4 7]);
 int8colvector_ref = int8([1;-4;7]);
 int8matrix_ref = int8([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int8_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int8_v1.sod");
 assert_checkequal(emptyint8matrix, emptyint8matrix_ref);
 assert_checkequal(int8scalar, int8scalar_ref);
 assert_checkequal(int8rowvector, int8rowvector_ref);
@@ -111,7 +111,7 @@ int16scalar_ref = int16(1);
 int16rowvector_ref = int16([1 -4 7]);
 int16colvector_ref = int16([1;-4;7]);
 int16matrix_ref = int16([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int16_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int16_v1.sod");
 assert_checkequal(emptyint16matrix, emptyint16matrix_ref);
 assert_checkequal(int16scalar, int16scalar_ref);
 assert_checkequal(int16rowvector, int16rowvector_ref);
@@ -124,7 +124,7 @@ int32scalar_ref = int32(1);
 int32rowvector_ref = int32([1 -4 7]);
 int32colvector_ref = int32([1;-4;7]);
 int32matrix_ref = int32([1 -4 7;-9 6 -3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/int32_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/int32_v1.sod");
 assert_checkequal(emptyint32matrix, emptyint32matrix_ref);
 assert_checkequal(int32scalar, int32scalar_ref);
 assert_checkequal(int32rowvector, int32rowvector_ref);
@@ -137,7 +137,7 @@ uint8scalar_ref = uint8(1);
 uint8rowvector_ref = uint8([1 4 7]);
 uint8colvector_ref = uint8([1;4;7]);
 uint8matrix_ref = uint8([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint8_v1.sod");
 assert_checkequal(emptyuint8matrix, emptyuint8matrix_ref);
 assert_checkequal(uint8scalar, uint8scalar_ref);
 assert_checkequal(uint8rowvector, uint8rowvector_ref);
@@ -150,7 +150,7 @@ uint16scalar_ref = uint16(1);
 uint16rowvector_ref = uint16([1 4 7]);
 uint16colvector_ref = uint16([1;4;7]);
 uint16matrix_ref = uint16([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint16_v1.sod");
 assert_checkequal(emptyuint16matrix, emptyuint16matrix_ref);
 assert_checkequal(uint16scalar, uint16scalar_ref);
 assert_checkequal(uint16rowvector, uint16rowvector_ref);
@@ -163,7 +163,7 @@ uint32scalar_ref = uint32(1);
 uint32rowvector_ref = uint32([1 4 7]);
 uint32colvector_ref = uint32([1;4;7]);
 uint32matrix_ref = uint32([1 4 7;9 6 3]);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/uint32_v1.sod");
 assert_checkequal(emptyuint32matrix, emptyuint32matrix_ref);
 assert_checkequal(uint32scalar, uint32scalar_ref);
 assert_checkequal(uint32rowvector, uint32rowvector_ref);
@@ -172,15 +172,15 @@ assert_checkequal(uint32matrix, uint32matrix_ref);
 
 
 // undefined
-undefinedelement_ref=list(2,%i,'f',ones(3,3));
+undefinedelement_ref=list(2,%i,"f",ones(3,3));
 undefinedelement_ref(6)="toto";
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/undefinedelement_v1.sod");
 assert_checkequal(undefinedelement, undefinedelement_ref);
 
 
 // void
 voidelement_ref=list(1,,3);
-import_from_hdf5(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement_v1.sod");
+load(SCI+"/modules/hdf5/tests/sample_scilab_data/voidelement_v1.sod");
 // Commented because of bug 9529
 //assert_checkequal(voidelement, voidelement_ref);
 
@@ -11,17 +11,17 @@ clear "checkValue";
 function checkValue(value)
     clear "varName";
     varName = value;
-    fileName = TMPDIR + "/exportImportHdf5.sod";
+    fileName = TMPDIR + "/saveloadHdf5.sod";
     // export to hdf5
     oldVarName = varName;
-    assert_checkequal(export_to_hdf5(fileName, "varName"), %t);
+    assert_checkequal(save(fileName, "varName"), %t);
     // check that the "varName" has not been modified by export
     assert_checkequal(oldVarName, varName);
     // reset ref value
     clear "varName" "oldVarName";
     assert_checkequal(exists("varName"), 0);
     // import from hdf5
-    assert_checkequal(import_from_hdf5(fileName), %t);
+    assert_checkequal(load(fileName), %t);
     assert_checkequal(varName, value);
 endfunction
 
@@ -246,17 +246,17 @@ l = list(1, , 3);
 
 // l == l return [%t %f %t],
 // we can't use assertcheck_equal(computed, expected)
-fileName = TMPDIR + "/exportImportHdf5.sod";
+fileName = TMPDIR + "/saveloadHdf5.sod";
 // export to hdf5
 old_l = l;
-assert_checktrue(export_to_hdf5(fileName, "l"));
+assert_checktrue(save(fileName, "l"));
 // check that the "l" has not been modified by export
 assert_checkequal(old_l == l, [%t %f %t]);
 // reset ref value
 clear l old_l
 assert_checktrue(exists("l")==0);
 // import from hdf5
-assert_checktrue(import_from_hdf5(fileName));
+assert_checktrue(load(fileName));
 assert_checkequal(l == list(1, , 3), [%t %f %t]);
 
 // Struct
index 9f530d2..e6bf40c 100644 (file)
@@ -458,7 +458,6 @@ exists
 exp
 expm
 exportUI
-export_to_hdf5
 eye
 fadj2sp
 fec
@@ -581,7 +580,6 @@ ieee
 ilib_verbose
 imag
 impl
-import_from_hdf5
 imult
 inpnvi
 int
index a5b7c2a..d2c4b1d 100644 (file)
@@ -28,7 +28,6 @@ GATEWAY_C_SOURCES = \
 
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_genlib.cpp \
-    sci_gateway/cpp/sci_load.cpp \
     sci_gateway/cpp/sci_file.cpp \
     sci_gateway/cpp/sci_host.cpp \
     sci_gateway/cpp/sci_unix.cpp \
index dd6457f..9626d2f 100644 (file)
@@ -190,7 +190,6 @@ am__objects_3 = sci_gateway/c/libsciio_la-sci_read4b.lo \
        sci_gateway/c/libsciio_la-sci_getpid.lo \
        sci_gateway/c/libsciio_la-sci_write4b.lo
 am__objects_4 = sci_gateway/cpp/libsciio_la-sci_genlib.lo \
-       sci_gateway/cpp/libsciio_la-sci_load.lo \
        sci_gateway/cpp/libsciio_la-sci_file.lo \
        sci_gateway/cpp/libsciio_la-sci_host.lo \
        sci_gateway/cpp/libsciio_la-sci_unix.lo \
@@ -590,7 +589,6 @@ GATEWAY_C_SOURCES = \
 
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_genlib.cpp \
-    sci_gateway/cpp/sci_load.cpp \
     sci_gateway/cpp/sci_file.cpp \
     sci_gateway/cpp/sci_host.cpp \
     sci_gateway/cpp/sci_unix.cpp \
@@ -876,9 +874,6 @@ sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/cpp/libsciio_la-sci_genlib.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libsciio_la-sci_load.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciio_la-sci_file.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -927,7 +922,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_genlib.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_host.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_lib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_load.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_read.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_unix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_write.Plo@am__quote@
@@ -1107,13 +1101,6 @@ sci_gateway/cpp/libsciio_la-sci_genlib.lo: sci_gateway/cpp/sci_genlib.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciio_la-sci_genlib.lo `test -f 'sci_gateway/cpp/sci_genlib.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_genlib.cpp
 
-sci_gateway/cpp/libsciio_la-sci_load.lo: sci_gateway/cpp/sci_load.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciio_la-sci_load.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_load.Tpo -c -o sci_gateway/cpp/libsciio_la-sci_load.lo `test -f 'sci_gateway/cpp/sci_load.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_load.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_load.Tpo sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_load.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_load.cpp' object='sci_gateway/cpp/libsciio_la-sci_load.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciio_la-sci_load.lo `test -f 'sci_gateway/cpp/sci_load.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_load.cpp
-
 sci_gateway/cpp/libsciio_la-sci_file.lo: sci_gateway/cpp/sci_file.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciio_la-sci_file.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_file.Tpo -c -o sci_gateway/cpp/libsciio_la-sci_file.lo `test -f 'sci_gateway/cpp/sci_file.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_file.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_file.Tpo sci_gateway/cpp/$(DEPDIR)/libsciio_la-sci_file.Plo
index 6452a61..30649b1 100644 (file)
@@ -22,7 +22,6 @@ IO_IMPEXP int gw_io(void);
 //YaSp
 int sci_getenv(char *fname, void* pvApiCtx);
 int sci_setenv(char *fname, void* pvApiCtx);
-//IO_IMPEXP int sci_load(char *fname, void* pvApiCtx); Now in C++ in io_gw/sci_gateway/cpp/sci_load.cpp
 
 //int sci_read(char *fname, unsigned long fname_len);
 int sci_oldsave(char *fname, unsigned long fname_len);
index 92f7079..5ac0f78 100644 (file)
@@ -35,7 +35,6 @@ public :
 
 #endif /* __IO_GW_HXX__ */
 
-CPP_GATEWAY_PROTOTYPE(sci_load);
 CPP_GATEWAY_PROTOTYPE(sci_genlib);
 CPP_GATEWAY_PROTOTYPE(sci_file);
 CPP_GATEWAY_PROTOTYPE(sci_host);
diff --git a/scilab/modules/io/macros/%_save.sci b/scilab/modules/io/macros/%_save.sci
deleted file mode 100644 (file)
index cffcbc3..0000000
+++ /dev/null
@@ -1,1079 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2012 - DIGITEO - Antoine ELIAS
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
-//2012/08/06 transform macros to string to save it
-
-//called by save function, transform handle in tlist and save result
-function [] = %_save(%__filename__, varargin)
-
-    function result = isList(var)
-
-        //15 : list
-        //16 : tlist
-        //17 : mlist
-        if or(type(var) == [15, 16, 17]) then
-            result  = %t;
-        else
-            result = %f;
-        end
-    endfunction
-
-    function result = isMacro(var)
-        //11 : sci_u_function
-        if or(type(var) == [11]) then
-            result  = %t;
-        else
-            result = %f;
-        end
-    endfunction
-
-    function result = isCompiledMacro(var)
-        //11 : sci_c_function
-        if or(type(var) == [13]) then
-            result  = %t;
-        else
-            result = %f;
-        end
-    endfunction
-
-    function result = inspectList(l)
-        if or(typeof(l)==["cell","st"]) then
-            if typeof(l)=="st" then
-                fieldNames = fieldnames(l);
-            else
-                fieldNames = l;
-            end
-
-            for kField = 1:size(fieldNames,"*")
-
-                if typeof(l)=="st" then
-                    fieldValue = l(fieldNames(kField));
-                else
-                    fieldValue = l{kField};
-                end
-
-                if typeof(fieldValue) == "handle" then
-                    fieldValue = extractMatrixHandle(fieldValue);
-                elseif isMacro(fieldValue) | isCompiledMacro(fieldValue) then
-                    //build an arbitrary name to the macro
-                    fieldValue = extractMacro(fieldValue, "function");
-                elseif isList(fieldValue) then
-                    fieldValue = inspectList(fieldValue);
-                end
-
-                if typeof(l)=="st" then
-                    l(fieldNames(kField)) = fieldValue;
-                else
-                    l{kField} = fieldValue;
-                end
-
-            end
-            result = l;
-
-        elseif typeof(l)=="list" then
-            result = list();
-            for %__i__ = definedfields(l)
-                if typeof(l(%__i__)) == "handle" then
-                    if ~is_handle_valid(l(%__i__)) then
-                        oldMode = warning("query");
-                        warning("on");
-                        warning(msprintf(gettext("%s: handle no more valid ignored.\n"), "save"));
-                        warning(oldMode);
-                        result(%__i__) = [];
-                    else
-                        result(%__i__) = extractMatrixHandle(l(%__i__));
-                    end
-                elseif isMacro(l(%__i__)) | isCompiledMacro(l(%__i__)) then
-                    //build an arbitrary name to the macro
-                    result(%__i__) = extractMacro(l(%__i__), "function");
-                elseif isList(l(%__i__)) then
-                    result(%__i__) = inspectList(l(%__i__));
-                elseif type(l(%__i__)) == 14 then //library, must not be save
-                    result(%__i__) = [];
-                else
-                    result(%__i__) = l(%__i__);
-                end
-            end
-        else
-            fieldNb = size(getfield(1, l), "*");
-            for kField = 2:fieldNb // Do not inspect first field (field names)
-                fieldValue = getfield(kField, l);
-                if typeof(fieldValue) == "handle" then
-                    fieldValue = extractMatrixHandle(fieldValue);
-                elseif isMacro(fieldValue) | isCompiledMacro(fieldValue) then
-                    //build an arbitrary name to the macro
-                    fieldValue = extractMacro(fieldValue, "function");
-                elseif isList(fieldValue) then
-                    fieldValue = inspectList(fieldValue);
-                end
-                setfield(kField, fieldValue, l);
-            end
-            result = l;
-        end
-    endfunction
-
-    function matrixHandle = extractMatrixHandle(h)
-
-        if typeof(h) <> "handle" then
-            matrixHandle = [];
-            return;
-        end
-
-        matrixHandle = tlist(["ScilabMatrixHandle", "dims", "values"]);
-        matrixHandle.dims = size(h);
-        matrixHandle.values = list();
-        for %__i__ = 1:size(h, "*")
-            matrixHandle.values($+1) = extractSingleHandle(h(%__i__));
-            if or(fieldnames(matrixHandle.values($))=="user_data") then
-                if isList(matrixHandle.values($).user_data) then
-                    matrixHandle.values($).user_data = inspectList(matrixHandle.values($).user_data)
-                elseif typeof(matrixHandle.values($).user_data) == "handle" then
-                    matrixHandle.values($).user_data = extractMatrixHandle(matrixHandle.values($).user_data)
-                end
-            end
-        end
-    endfunction
-
-
-    function item = extractSingleHandle(h)
-
-        select h.type
-        case "Figure"
-            item = extractFigure(h);
-        case "Axes"
-            item = extractAxes(h);
-        case "Polyline"
-            item = extractPolyline(h);
-        case "Plot3d"
-            item = extractPlot3d(h);
-        case "Fac3d"
-            item = extractFac3d(h);
-        case "Compound"
-            item = extractCompound(h);
-        case "Rectangle"
-            item = extractRectangle(h);
-        case "Arc"
-            item = extractArc(h);
-        case "Champ"
-            item = extractChamp(h);
-        case "Segs"
-            item = extractSegs(h);
-        case "Grayplot"
-            item = extractGrayplot(h);
-        case "Matplot"
-            item = extractMatplot(h);
-        case "Fec"
-            item = extractFec(h);
-        case "Legend"
-            item = extractLegend(h);
-        case "Text"
-            item = extractText(h);
-        case "Axis"
-            item = extractAxis(h);
-        case "uimenu"
-            item = extractuimenu(h);
-        case "uicontextmenu"
-            item = extractuicontextmenu(h);
-        case "uicontrol"
-            item = extractuicontrol(h);
-        case "Datatip"
-            item = extractDatatip(h);
-        case "Light"
-            item = extractLight(h);
-        else
-            error("handle of type " + h.type + " unhandled");
-            item = [];
-        end
-    endfunction
-
-    //
-    // FIGURE
-    //
-    function returnedFigure = extractFigure(h)
-        returnedFigure = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "figure_position", ...
-        "figure_size", ...
-        "axes_size", ...
-        "viewport", ...
-        "info_message", ...
-        "tag", ...
-        "auto_resize", ...
-        "figure_name", ...
-        "figure_id", ...
-        "color_map", ...
-        "pixel_drawing_mode", ...
-        "anti_aliasing", ...
-        "immediate_drawing", ...
-        "background", ...
-        "rotation_style", ...
-        "event_handler", ...
-        "event_handler_enable", ...
-        "resizefcn", ...
-        "closerequestfcn", ...
-        "resize", ...
-        "toolbar", ...
-        "toolbar_visible", ...
-        "menubar", ...
-        "menubar_visible", ...
-        "infobar_visible", ...
-        "dockable", ...
-        "layout", ...
-        "layout_options", ...
-        "default_axes", ...
-        "icon", ...
-        "children", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedFigure);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "children" then
-                returnedFigure(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returnedFigure(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // LABEL
-    //
-    function returnedLabel = extractLabel(h)
-        returnedLabel = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "text", ...
-        "font_foreground", ...
-        "foreground", ...
-        "background", ...
-        "fill_mode", ...
-        "font_style", ...
-        "font_size", ...
-        "fractional_font", ...
-        "font_angle", ...
-        "auto_rotation", ...
-        "position", ...
-        "auto_position"]);
-
-        fields = fieldnames(returnedLabel);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedLabel(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // TICKS
-    //
-    function returnedTicks = extractTicks(ticks)
-        returnedTicks = tlist([
-        "Ticks", ...
-        "locations", ...
-        "labels"]);
-
-        fields = fieldnames(returnedTicks);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedTicks(fields(%__i__)) = ticks(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // AXES
-    //
-    function returnedAxes = extractAxes(h)
-        returnedAxes = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "axes_visible", ...
-        "axes_reverse", ...
-        "grid", ...
-        "grid_position", ...
-        "grid_thickness", ...
-        "grid_style", ...
-        "x_location", ...
-        "y_location", ...
-        "view", ...
-        "title", ...
-        "x_label", ...
-        "y_label", ...
-        "z_label", ...
-        "auto_ticks", ...
-        "x_ticks", ...
-        "y_ticks", ...
-        "z_ticks", ...
-        "ticks_format", ...
-        "ticks_st", ...
-        "box", ...
-        "filled", ...
-        "sub_tics", ...
-        "font_style", ...
-        "font_size", ...
-        "font_color", ...
-        "fractional_font", ...
-        "isoview", ...
-        "cube_scaling", ...
-        "rotation_angles", ...
-        "log_flags", ...
-        "tight_limits", ...
-        "data_bounds", ...
-        "zoom_box", ...
-        "margins", ...
-        "auto_margins", ...
-        "axes_bounds", ...
-        "auto_clear", ...
-        "auto_scale", ...
-        "hidden_axis_color", ...
-        "arc_drawing_method", ...
-        "hiddencolor", ...
-        "line_mode", ...
-        "line_style", ...
-        "thickness", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size", ...
-        "mark_size_unit", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "foreground", ...
-        "background", ...
-        "clip_state", ...
-        "clip_box", ...
-        "children", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedAxes);
-
-        for %__i__ = 1:size(fields, "*")
-            if or(fields(%__i__) == ["title","x_label","y_label","z_label"]) then
-                returnedAxes(fields(%__i__)) = extractLabel(h(fields(%__i__)));
-            elseif or(fields(%__i__) == ["x_ticks", "y_ticks", "z_ticks"]) then
-                returnedAxes(fields(%__i__)) = extractTicks(h(fields(%__i__)));
-            elseif fields(%__i__) == "children" then
-                returnedAxes(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returnedAxes(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // POLYLINE
-    //
-    function returnedPolyline = extractPolyline(h)
-        returnedPolyline = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "datatips", ...
-        "display_function", ...
-        "display_function_data", ...
-        "data", ...
-        "closed", ...
-        "line_mode", ...
-        "fill_mode", ...
-        "line_style", ...
-        "thickness", ...
-        "arrow_size_factor", ...
-        "polyline_style", ...
-        "interp_color_vector", ...
-        "interp_color_mode", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size", ...
-        "mark_size_unit", ...
-        "foreground", ...
-        "background", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "mark_offset", ...
-        "mark_stride", ...
-        "x_shift", ...
-        "y_shift", ...
-        "z_shift", ...
-        "bar_width", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data", ...
-        "colors"]);
-
-        fields = fieldnames(returnedPolyline);
-
-        for %__i__ = 1:size(fields, "*")
-            if or(fields(%__i__) == ["children", "datatips"]) then
-                returnedPolyline(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returnedPolyline(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // PLOT3D
-    //
-    function returnedPlot3d = extractPlot3d(h)
-        returnedPlot3d = extractSurface(h);
-    endfunction
-
-    //
-    // FAC3D
-    //
-    function returnedFac3d = extractFac3d(h)
-        returnedFac3d = extractSurface(h);
-    endfunction
-
-    //
-    // SURFACE
-    //
-    function returnedSurface = extractSurface(h)
-        returnedSurface = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "surface_mode", ...
-        "foreground", ...
-        "thickness", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size", ...
-        "mark_size_unit", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "color_mode", ...
-        "color_flag", ...
-        "data", ...
-        "ambient_color", ...
-        "diffuse_color", ...
-        "specular_color", ...
-        "use_color_material", ...
-        "material_shininess", ...
-        "hiddencolor", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data", ...
-        "cdata_mapping"]);
-
-        fields = fieldnames(returnedSurface);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__)=="cdata_mapping" then
-                if h.type=="Fac3d" then
-                    returnedSurface(fields(%__i__)) = h(fields(%__i__));
-                end
-            else
-                returnedSurface(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // COMPOUND
-    //
-    function returnedCompound = extractCompound(h)
-        returnedCompound = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "children", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedCompound);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "children" then
-                returnedCompound(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returnedCompound(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // RECTANGLE
-    //
-    function returnedRectangle = extractRectangle(h)
-        returnedRectangle = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "thickness", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size", ...
-        "mark_size_unit", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "line_mode", ...
-        "line_style", ...
-        "fill_mode", ...
-        "foreground", ...
-        "background", ...
-        "data", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedRectangle);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedRectangle(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // ARC
-    //
-    function returnedArc = extractArc(h)
-        returnedArc = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "thickness", ...
-        "line_style", ...
-        "line_mode", ...
-        "fill_mode", ...
-        "foreground", ...
-        "background", ...
-        "data", ...
-        "arc_drawing_method", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedArc);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedArc(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // CHAMP
-    //
-    function returnedChamp = extractChamp(h)
-        returnedChamp = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "line_style", ...
-        "thickness", ...
-        "colored", ...
-        "arrow_size", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedChamp);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedChamp(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // SEG
-    //
-    function returnedSeg = extractSegs(h)
-        returnedSeg = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "line_mode", ...
-        "line_style", ...
-        "thickness", ...
-        "segs_color", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size", ...
-        "mark_size_unit", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedSeg);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedSeg(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // GRAYPLOT
-    //
-    function returnedGrayplot = extractGrayplot(h)
-        returnedGrayplot = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "data_mapping", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedGrayplot);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedGrayplot(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // MATPLOT
-    //
-    function returnedMatplot = extractMatplot(h)
-        returnedMatplot = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "rect", ...
-        "image_type", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedMatplot);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedMatplot(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // FEC
-    //
-    function returnedFec = extractFec(h)
-        returnedFec = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "triangles", ...
-        "z_bounds", ...
-        "color_range", ...
-        "outside_colors", ...
-        "line_mode", ...
-        "foreground", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedFec);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedFec(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // LEGEND
-    //
-    function returnedLegend = extractLegend(h)
-        // Utility function for legends, copy/paste from %h_load
-        function p=get_entity_path(e)
-            // given a handle e on an entity this function returns its path relative
-            // to its parent axes.
-            // the path is a vector of child index.
-            p=[];
-            parent=e.parent;
-
-            while %t
-                pos=find(parent.children==e,1)
-                if pos==[] then
-                    error(msprintf(_("%s : Invalid entity %s\n"),"save","Legend"))
-                end
-                p=[pos p]
-                if parent.type=="Axes" then
-                    break
-                end
-                e=parent
-                parent=e.parent;
-            end
-        endfunction
-
-        returnedLegend = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "text", ...
-        "font_style", ...
-        "font_size", ...
-        "font_color", ...
-        "fractional_font", ...
-        "links", ...
-        "legend_location", ...
-        "position", ...
-        "line_width", ...
-        "line_mode", ...
-        "thickness", ...
-        "foreground", ...
-        "fill_mode", ...
-        "background", ...
-        "marks_count", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data", ..
-        "paths"]);
-
-        fields = fieldnames(returnedLegend);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "links" then
-                returnedLegend(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            elseif fields(%__i__) == "paths" then
-                p = list();
-                for kl=1:size(h.links,"*");
-                    p($+1) = get_entity_path(h.links(kl));
-                end
-                returnedLegend(fields(%__i__)) = p;
-            else
-                returnedLegend(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // TEXT
-    //
-    function returnedText = extractText(h)
-        returnedText = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "text", ...
-        "data", ...
-        "text_box", ...
-        "text_box_mode", ...
-        "foreground", ...
-        "font_style", ...
-        "font_size", ...
-        "font_angle", ...
-        "box", ...
-        "line_mode", ...
-        "fill_mode", ...
-        "font_foreground", ...
-        "background", ...
-        "alignment", ...
-        "fractional_font", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedText);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedText(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // DATATIP
-    //
-    function returnedDatatip = extractDatatip(h)
-        returnedDatatip = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "data", ...
-        "box_mode", ...
-        "label_mode", ...
-        "orientation", ...
-        "z_component", ...
-        "auto_orientation", ...
-        "interp_mode", ...
-        "display_function", ...
-        "font_foreground", ...
-        "foreground", ...
-        "background", ...
-        "mark_mode", ...
-        "mark_style", ...
-        "mark_size_unit", ...
-        "mark_size", ...
-        "mark_foreground", ...
-        "mark_background", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedDatatip);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedDatatip(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // AXIS
-    //
-    function returnedAxis = extractAxis(h)
-        returnedAxis = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "tics_direction", ...
-        "xtics_coord", ...
-        "ytics_coord", ...
-        "tics_color", ...
-        "tics_segment", ...
-        "tics_style", ...
-        "sub_tics", ...
-        "tics_labels", ...
-        "labels_font_size", ...
-        "labels_font_color", ...
-        "fractional_font", ...
-        "clip_state", ...
-        "clip_box", ...
-        "user_data"]);
-
-        fields = fieldnames(returnedAxis);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedAxis(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    //
-    // uimenu
-    //
-    function returneduimenu = extractuimenu(h)
-        returneduimenu = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "enable", ...
-        "foregroundcolor", ...
-        "label", ...
-        "visible", ...
-        "callback", ...
-        "callback_type", ...
-        "tag", ...
-        "checked", ...
-        "children", ...
-        "icon", ...
-        "user_data"]);
-
-        fields = fieldnames(returneduimenu);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "children" then
-                returneduimenu(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returneduimenu(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // UICONTEXTMENU
-    //
-    function returneduicontextmenu = extractuicontextmenu(h)
-        returneduicontextmenu = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "children"]);
-
-        fields = fieldnames(returneduicontextmenu);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "children" then
-                returneduicontextmenu(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returneduicontextmenu(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // uicontrol
-    //
-    function returneduicontrol = extractuicontrol(h)
-        returneduicontrol = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "style", ...
-        "backgroundcolor", ...
-        "enable", ...
-        "fontangle", ...
-        "fontname", ...
-        "fontsize", ...
-        "fontunits", ...
-        "fontweight", ...
-        "foregroundcolor", ...
-        "horizontalalignment", ...
-        "listboxtop", ...
-        "max", ...
-        "min", ...
-        "position", ...
-        "relief", ...
-        "sliderstep", ...
-        "string", ...
-        "tooltipstring", ...
-        "units", ...
-        "value", ...
-        "verticalalignment", ...
-        "visible", ...
-        "callback", ...
-        "callback_type", ...
-        "layout", ...
-        "layout_options", ...
-        "constraints", ...
-        "border", ...
-        "margins", ...
-        "groupname", ...
-        "scrollable", ...
-        "icon", ...
-        "user_data", ...
-        "tag", ...
-        "children"]);
-
-        fields = fieldnames(returneduicontrol);
-
-        for %__i__ = 1:size(fields, "*")
-            if fields(%__i__) == "children" then
-                returneduicontrol(fields(%__i__)) = extractMatrixHandle(h(fields(%__i__)));
-            else
-                returneduicontrol(fields(%__i__)) = h(fields(%__i__));
-            end
-        end
-    endfunction
-
-    //
-    // LIGHT
-    //
-    function returnedLight = extractLight(h)
-        returnedLight = tlist([
-        "ScilabSingleHandle", ...
-        "type", ...
-        "visible", ...
-        "light_type", ...
-        "position", ...
-        "direction", ...
-        "ambient_color", ...
-        "diffuse_color", ...
-        "specular_color"]);
-
-        fields = fieldnames(returnedLight);
-
-        for %__i__ = 1:size(fields, "*")
-            returnedLight(fields(%__i__)) = h(fields(%__i__));
-        end
-    endfunction
-
-    function macro = extractMacro(macroPtr, macroName)
-        macroSt = fun2string(macroPtr, macroName);
-        oldMode = warning("query");
-        warning("off");
-        macro = tlist("ScilabMacro", isCompiledMacro(macroPtr), macroSt);
-        warning(oldMode);
-    endfunction
-
-    //main
-
-    //save environment
-    if size(varargin) == 0 then
-        %__excludeList__ = [
-        "%_save"
-        "isList"
-        "isMacro"
-        "isCompiledMacro"
-        "inspectList"
-        "extractMatrixHandle"
-        "extractSingleHandle"
-        "extractFigure"
-        "extractLabel"
-        "extractTicks"
-        "extractAxes"
-        "extractPolyline"
-        "extractPlot3d"
-        "extractFac3d"
-        "extractSurface"
-        "extractCompound"
-        "extractRectangle"
-        "extractArc"
-        "extractChamp"
-        "extractSegs"
-        "extractGrayplot"
-        "extractMatplot"
-        "extractFec"
-        "extractLegend"
-        "extractText"
-        "extractAxis"
-        "extractuimenu"
-        "extractuicontextmenu"
-        "extractuicontrol"
-        "get_entity_path"
-        "extractMacro"
-        "%__excludeList__"
-        "%__filename__"
-        "varargin"
-        "%__varList__"];
-
-        //get all user variables
-        %__varList__ = who_user(%f);
-        //remove exclude variables/functions
-        %__grepResult__ = grep(%__varList__, %__excludeList__);
-        %__varList__(%__grepResult__) = [];
-        for %__i__ = 1:size(%__varList__, "*")
-            //store them as input arguments
-            varargin(%__i__) = %__varList__(%__i__);
-        end
-    end
-
-    oldMode = warning("query");
-    warning("off");
-
-    if size(varargin) == 0 then
-    end
-
-    for %__i__ = size(varargin):-1:1
-
-        if varargin(%__i__) == "-append" then
-            continue;
-        end
-
-        %__temp__ = evstr(varargin(%__i__));
-
-        if isList(%__temp__) then
-            //list container
-            value = inspectList(%__temp__);
-            //update
-            execstr(varargin(%__i__) + " = value");
-        elseif typeof(%__temp__) == "handle" then
-            if ~is_handle_valid(%__temp__) then // Invalid handle ignored
-                warning(oldMode);
-                warning(msprintf(gettext("%s: handle no more valid ignored.\n"), "save"));
-                warning("off");
-                varargin(%__i__) = null();
-            else //convert handle to tlist
-                value = extractMatrixHandle(%__temp__);
-                //update
-                execstr(varargin(%__i__) + " = value");
-            end
-        elseif isMacro(%__temp__) | isCompiledMacro(%__temp__) then
-            //convert macro to tlist
-            value = extractMacro(%__temp__, varargin(%__i__));
-            //update
-            execstr(varargin(%__i__) + " = value");
-        elseif type(%__temp__) == 14 then //library, must not be save
-            varargin(%__i__) = null();
-        end
-    end
-    warning(oldMode);
-
-    //if size(varargin) == 0, create an empty file
-    result = export_to_hdf5(%__filename__, varargin(:));
-
-endfunction
index 4804815..37e7ccd 100644 (file)
@@ -23,8 +23,6 @@ using namespace types;
 
 int IoModule::Load()
 {
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"load", &sci_load, MODULE_NAME));
-    //symbol::Context::getInstance()->addFunction(Function::createFunction(L"save", &sci_save, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"genlib", &sci_genlib, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"file", &sci_file, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"host", &sci_host, MODULE_NAME));
index bad447d..4a1c691 100644 (file)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_file.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_genlib.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_host.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_load.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_unix.cpp" />
     <ClCompile Include="readwrite.cpp" />
   </ItemGroup>
index ac0f053..cbe18df 100644 (file)
@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\sci_gateway\cpp\sci_host.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_load.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_unix.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
index d7dd312..f459624 100644 (file)
@@ -85,7 +85,9 @@ function tbx_build_blocks(module, names, macros_path)
 
         // export the instance
         execstr(msprintf("scs_m = %s (''define'');", names(i)));
-        if ~export_to_hdf5(h5Files(i), "scs_m") then
+        try
+            save(h5Files(i), "scs_m");
+        catch
             error(msprintf(gettext("%s: Unable to export %s to %s.\n"),"tbx_build_blocks",names(i), h5Files(i)));
         end
 
index 3774be0..c5dc142 100644 (file)
@@ -19,7 +19,7 @@ assert_checkequal(size(c0), [1 3]);
 assert_checkequal(c0(3),  0);
 assert_checkequal(size(zzeros), [1 5]);
 assert_checkequal(size(zpoles), [1 5]);
-import_from_hdf5(test_path+"syredi.h5");
+load(test_path+"syredi.h5");
 [fact1, b21, b11, b01, c11, c01, zzeros1, zpoles1] = syredi(1, 4, [1, 2, 0, 0], 0.02, 0.001);
 assert_checkequal(fact1, fact1_ref);
 assert_checkequal(b21, b21_ref);
index 1fb244b..48b9aa7 100644 (file)
@@ -22,7 +22,7 @@ assert_checkequal(c0(3),  0);
 assert_checkequal(size(zzeros), [1 5]);
 assert_checkequal(size(zpoles), [1 5]);
 
-import_from_hdf5(test_path+"syredi.h5");
+load(test_path+"syredi.h5");
 [fact1, b21, b11, b01, c11, c01, zzeros1, zpoles1] = syredi(1, 4, [1, 2, 0, 0], 0.02, 0.001);
 assert_checkequal(fact1, fact1_ref);
 assert_checkequal(b21, b21_ref);
index 0819fe2..960d13a 100644 (file)
@@ -23,9 +23,10 @@ function %Block_xcosUpdateBlock(blk)
 
     // export to hdf5
     blk = blk;
-    if export_to_hdf5(tempfile, "blk") then
+    try
+        save(tempfile, "blk")
         xcosUpdateBlock(tempfile)
-    else
+    catch
         error(msprintf(gettext("%s: Unable to export %s to %s.\n"), "xcosUpdateBlock", "`blk''", tempfile));
     end
 
index 070c10d..ac08cf3 100644 (file)
@@ -109,30 +109,37 @@ function importScicosPal(palFiles, outPath)
             if isfile(blockFile) then
                 //if the file already exists try to load data and compare
                 out2 = out;
-                bImport = import_from_hdf5(blockFile);
-
-                //data are identical
-                if bImport == %t & isequal(out, out2) then
-                    doExport = %f;
-                else
-                    out = out2;
+                try
+                    load(blockFile);
+                    //data are identical
+                    if isequal(out, out2) then
+                        doExport = %f;
+                    else
+                        out = out2;
+                    end
+                catch
                 end
             end
 
             if doExport == %t then
                 mprintf("%d: %s\n", i, block_name);
-                bexport = export_to_hdf5(blockFile, "out");
-                if (~bexport) then
+                try
+                    save(blockFile, "out");
+                catch
                     mprintf("FAILED TO EXPORT: %s\n", out.gui);
                 end
 
                 out2 = out;
-                bImport = import_from_hdf5(blockFile);
-
-                if bImport == %f | or(out2 <> out) then
+                try
+                    load(blockFile);
+
+                    if or(out2 <> out) then
+                        mprintf("FAILED TO EXPORT: %s\n", out.gui);
+                    end
+                    exportedBlocks = exportedBlocks + 1;
+                catch
                     mprintf("FAILED TO EXPORT: %s\n", out.gui);
                 end
-                exportedBlocks = exportedBlocks + 1;
             end
         end
     end
index 6271f22..6514d24 100644 (file)
@@ -78,7 +78,7 @@ function [status, msg] = xcosPalAdd(pal, category)
         path = pal;
 
         clear pal
-        import_from_hdf5(path);
+        load(path);
         if ~exists("pal", "l") then
             error(msprintf(gettext("%s: Wrong type for input argument ""%s"": palette type or path expected.\n"), "xcosPalAdd", "pal"));
         end
index 5c523a5..b79adba 100644 (file)
@@ -40,9 +40,9 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
     //  bigSomPath = TMPDIR + "/sum.sod";
     //
     //  scs_m = SUM_f("define");
-    //  export_to_hdf5(sumPath, "scs_m");
+    //  save(sumPath, "scs_m");
     //  scs_m = BIGSOM_f("define");
-    //  export_to_hdf5(bigSomPath, "scs_m");
+    //  save(bigSomPath, "scs_m");
     //
     //  pal = xcosPalAddBlock(pal, sumPath);
     //  pal = xcosPalAddBlock(pal, bigSomPath);
@@ -84,8 +84,9 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
         mclose(fd);
 
         // store the block instance
-        status = import_from_hdf5(block);
-        if ~status then
+        try
+            load(block);
+        catch
             error(msprintf(gettext("%s: Unable to load block from ""%s"": hdf5 file expected.\n"), "xcosPalAddBlock", block));
         end
 
index d4b3c2a..5bb9afd 100644 (file)
@@ -42,9 +42,9 @@ function [status, msg] = xcosPalExport(pal, path)
     //   bigSomPath = TMPDIR + "/sum.sod";
     //
     //   scs_m = SUM_f("define");
-    //   export_to_hdf5(sumPath, "scs_m");
+    //   save(sumPath, "scs_m");
     //   scs_m = BIGSOM("define");
-    //   export_to_hdf5(bigSomPath, "scs_m");
+    //   save(bigSomPath, "scs_m");
     //
     //   pal = xcosPalAddBlock(pal, sumPath);
     //   pal = xcosPalAddBlock(pal, bigSomPath);
@@ -92,8 +92,9 @@ function [status, msg] = xcosPalExport(pal, path)
     pal = pal;
 
     // export the data to the temp file
-    status = export_to_hdf5(path, "pal");
-    if ~status then
+    try
+        save(path, "pal");
+    catch
         msg = msprintf(gettext("%s: Unable to export the palette to hdf5.\n"), "xcosPalExport");
         if  lhs == 1 then
             error(msg);
index f05aa58..09deb80 100644 (file)
@@ -21,6 +21,6 @@ obj = scs_m.objs(1);
 if size(obj.doc) <> 0 then bugmes();quit;end
 // check that the export will not fail
 tempFile = TMPDIR + "/6776temp.sod";
-ierr = export_to_hdf5(tempFile, "scs_m");
-if ierr <> %t then bugmes();quit;end
+err = execstr("save(tempFile, ""scs_m"")", "errcatch");
+if err <> %t then bugmes();quit;end
 deletefile(tempFile);
index 703eb42..8f7d245 100644 (file)
@@ -25,8 +25,8 @@ if size(obj.doc) <> 0 then pause, end
 
 // check that the export will not fail
 tempFile = TMPDIR + "/6776temp.sod";
-ierr = export_to_hdf5(tempFile, "scs_m");
-if ierr <> %t then pause, end
+err = execstr("save(tempFile, ""scs_m"")", "errcatch");
+if err <> %t then pause, end
 
 deletefile(tempFile);
 
index 19d8f68..bd56f24 100644 (file)
@@ -23,7 +23,7 @@
 pal = xcosPal("My pal");
 scs_m = SUM_f("define");
 blockPath = TMPDIR + "/SUM_f.sod";
-export_to_hdf5(blockPath, "scs_m"),
+save(blockPath, "scs_m"),
 
 pal = xcosPalAddBlock(pal, blockPath);
 xcosPalAdd(pal);
index 78a81db..6aa625f 100644 (file)
@@ -30,8 +30,8 @@ for blockIndex=1:size(blocks, '*')
 end
 // export the diagram to h5
 h5name = TMPDIR + "/diagram.sod";
-status = export_to_hdf5(h5name, "scs_m");
-if ~status then bugmes();quit;end
+err = execstr("save(h5name, ""scs_m"")", "errcatch");
+if err <> 0 then bugmes();quit;end
 // import to xcos (decode/encode synchronous version)
 status = xcosDiagramToScilab(h5name);
 if status <> 0 then bugmes();quit;end
index b111078..26d9dd4 100644 (file)
@@ -24,23 +24,23 @@ doc = xmlRead(SCI + "/modules/xcos/etc/palettes.xml");
 blocks = xmlXPath(doc, "//block/@name");
 blocks = blocks.content;
 xmlDelete(doc);
-for blockIndex=1:size(blocks, '*')
+for blockIndex=1:size(blocks, "*")
     interfunction = blocks(blockIndex);
-    
+
     execstr("out = " + interfunction + "(''define'');");
-    
+
     xx = (modulo(blockIndex, 10) + 1) * 100;
     yy = int(blockIndex / 10) * 100;
     out.graphics.orig =[xx yy];
-    
+
     scs_m.objs(blockIndex) = out;
 end
 
 
 // export the diagram to h5
 h5name = TMPDIR + "/diagram.sod";
-status = export_to_hdf5(h5name, "scs_m");
-if ~status then pause, end
+err = execstr("save(h5name, ""scs_m"")", "errcatch");
+if err <> 0 then pause, end
 
 // import to xcos (decode/encode synchronous version)
 status = xcosDiagramToScilab(h5name);
index 7cc627c..69cdef2 100644 (file)
@@ -21,7 +21,7 @@ exec(SCI + "/modules/scicos/macros/scicos_scicos/scicos_block.sci", -1);
 // loading only the SUM_f block
 exec(SCI + "/modules/scicos_blocks/macros/Linear/SUM_f.sci", -1);
 scs_m = SUM_f("define");
-export_to_hdf5(TMPDIR + "/sum.sod", "scs_m");
+save(TMPDIR + "/sum.sod", "scs_m");
 pal = xcosPal("SamplePal");
 blockstyle = struct();
 pal = xcosPalAddBlock(pal, TMPDIR + "/sum.sod", SCI + "/modules/xcos/images/palettes/SUM_f.png", blockstyle);
index ec22034..bfd8b1c 100644 (file)
@@ -24,7 +24,7 @@ exec(SCI + "/modules/scicos/macros/scicos_scicos/scicos_block.sci", -1);
 exec(SCI + "/modules/scicos_blocks/macros/Linear/SUM_f.sci", -1);
 
 scs_m = SUM_f("define");
-export_to_hdf5(TMPDIR + "/sum.sod", "scs_m");
+save(TMPDIR + "/sum.sod", "scs_m");
 pal = xcosPal("SamplePal");
 blockstyle = struct();
 pal = xcosPalAddBlock(pal, TMPDIR + "/sum.sod", SCI + "/modules/xcos/images/palettes/SUM_f.png", blockstyle);
index c1ce2b1..b5edce4 100644 (file)
@@ -44,12 +44,6 @@ scs_m.objs(1)=scicos_block(..
                        gr_i=list(..
                        ["dx=sz(1)/5;dy=sz(2)/10;";
 tmpFileName = TMPDIR + "/bug_9478_scs_m.sod";
-assert_checktrue(export_to_hdf5(tmpFileName, "scs_m"))
- ans  =
-  T  
-assert_checktrue(isfile(tmpFileName))
- ans  =
-  T  
+err = execstr("save(tmpFileName, ""scs_m"")", "errcatch");
+assert_checktrue(err, 0);
 xcos(tmpFileName)
index d746a23..ff34c64 100644 (file)
 
 
 scs_m=scicos_diagram(..
-      version="scicos4.2",..
-      props=scicos_params(..
-            wpar=[-31.207834,624.42151,62.495145,459.85324,894,544,84,72,725,544,299,51,1.4],..
-            Title=["bug_9478",..
-            "/home/davidcl/"],..
-            tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],..
-            tf=210,..
-            context=" ",..
-            void1=[],..
-            options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],..
-            list([5,1],[4,1]),[0.8,0.8,0.8]),..
-            void2=[],..
-            void3=[],..
-            doc=list()));
+version="scicos4.2",..
+props=scicos_params(..
+wpar=[-31.207834,624.42151,62.495145,459.85324,894,544,84,72,725,544,299,51,1.4],..
+Title=["bug_9478",..
+"/home/davidcl/"],..
+tol=[0.0001;0.000001;1.000D-10;100001;0;0;0],..
+tf=210,..
+context=" ",..
+void1=[],..
+options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],..
+list([5,1],[4,1]),[0.8,0.8,0.8]),..
+void2=[],..
+void3=[],..
+doc=list()));
 scs_m.objs(1)=scicos_block(..
-              gui="CONST_m",..
-              graphics=scicos_graphics(..
-                       orig=[136.43864,240.71188],..
-                       sz=[40,40],..
-                       flip=%t,..
-                       theta=0,..
-                       exprs="0.1",..
-                       pin=[],..
-                       pout=11,..
-                       pein=[],..
-                       peout=[],..
-                       gr_i=list(..
-                       ["dx=sz(1)/5;dy=sz(2)/10;";
-                       "w=sz(1)-2*dx;h=sz(2)-2*dy;";
-                       "txt=C;";
-                       "xstringb(orig(1)+dx,orig(2)+dy,txt,w,h,''fill'');"],8),..
-                       id="",..
-                       in_implicit=[],..
-                       out_implicit="E"),..
-              model=scicos_model(..
-                       sim=list("cstblk4_m",4),..
-                       in=[],..
-                       in2=[],..
-                       intyp=1,..
-                       out=1,..
-                       out2=1,..
-                       outtyp=1,..
-                       evtin=[],..
-                       evtout=[],..
-                       state=[],..
-                       dstate=[],..
-                       odstate=list(),..
-                       rpar=[],..
-                       ipar=[],..
-                       opar=list(0.1),..
-                       blocktype="d",..
-                       firing=[],..
-                       dep_ut=[%f;%f],..
-                       label="",..
-                       nzcross=0,..
-                       nmode=0,..
-                       equations=list()),..
-              doc=list());
+gui="CONST_m",..
+graphics=scicos_graphics(..
+orig=[136.43864,240.71188],..
+sz=[40,40],..
+flip=%t,..
+theta=0,..
+exprs="0.1",..
+pin=[],..
+pout=11,..
+pein=[],..
+peout=[],..
+gr_i=list(..
+["dx=sz(1)/5;dy=sz(2)/10;";
+"w=sz(1)-2*dx;h=sz(2)-2*dy;";
+"txt=C;";
+"xstringb(orig(1)+dx,orig(2)+dy,txt,w,h,''fill'');"],8),..
+id="",..
+in_implicit=[],..
+out_implicit="E"),..
+model=scicos_model(..
+sim=list("cstblk4_m",4),..
+in=[],..
+in2=[],..
+intyp=1,..
+out=1,..
+out2=1,..
+outtyp=1,..
+evtin=[],..
+evtout=[],..
+state=[],..
+dstate=[],..
+odstate=list(),..
+rpar=[],..
+ipar=[],..
+opar=list(0.1),..
+blocktype="d",..
+firing=[],..
+dep_ut=[%f;%f],..
+label="",..
+nzcross=0,..
+nmode=0,..
+equations=list()),..
+doc=list());
 
 
 tmpFileName = TMPDIR + "/bug_9478_scs_m.sod";
 
-assert_checktrue(export_to_hdf5(tmpFileName, "scs_m"))
-assert_checktrue(isfile(tmpFileName))
+err = execstr("save(tmpFileName, ""scs_m"")", "errcatch");
+assert_checktrue(err, 0);
+assert_checktrue(isfile(tmpFileName));
 
 xcos(tmpFileName)
 
index b8e8ac3..110babb 100644 (file)
@@ -14,8 +14,8 @@
 //
 currentPath = SCI + "/modules/xcos/tests/unit_tests/block_tests/ESELECT_f/";
 // Import the reference data (A_ref)
-ierr = import_from_hdf5(currentPath + "sinus_ref.sod");
-if ierr <> %t then bugmes();quit;end
+ierr = execstr("load(currentPath + ""sinus_ref.sod"");", "errcatch");
+assert_checktrue(ierr == 0);
 // Import the diagram structure
 ierr = importXcosDiagram(currentPath + "sinus.zcos");
 if ierr <> %t then bugmes();quit;end
index 6ef24c0..1dfdad7 100644 (file)
@@ -17,8 +17,8 @@
 currentPath = SCI + "/modules/xcos/tests/unit_tests/block_tests/ESELECT_f/";
 
 // Import the reference data (A_ref)
-ierr = import_from_hdf5(currentPath + "sinus_ref.sod");
-if ierr <> %t then pause; end
+ierr = execstr("load(currentPath + ""sinus_ref.sod"");", "errcatch");
+assert_checktrue(ierr == 0);
 
 // Import the diagram structure
 ierr = importXcosDiagram(currentPath + "sinus.zcos");
index ccd016f..14655f3 100644 (file)
@@ -28,5 +28,5 @@ pal = xcosPalAddBlock(pal, "BIGSOM_f");
 if ~xcosPalAdd(pal) then bugmes();quit;end
 if ~xcosPalAdd(pal, "my Summation blocks") then bugmes();quit;end
 if ~xcosPalAdd(pal, ["Customs" "my Summation blocks"]) then bugmes();quit;end
-export_to_hdf5(TMPDIR + "/palette.sod", "pal");
+save(TMPDIR + "/palette.sod", "pal");
 if ~xcosPalAdd(TMPDIR + "/palette.sod") then bugmes();quit;end
index 238f0dc..38515ed 100644 (file)
@@ -21,9 +21,9 @@ endfunction
 
 function xcosPalLoad(pal, category)
     if typeof(pal) <> "string" then pause, end
-    if size(pal, '*') <> 1 then pause, end
+    if size(pal, "*") <> 1 then pause, end
     if typeof(category) <> "string" then pause, end
-    if and([size(category, 'r') > 1, size(category, 'c') > 1]) then pause, end
+    if and([size(category, "r") > 1, size(category, "c") > 1]) then pause, end
 endfunction
 
 funcprot(prot);
@@ -37,6 +37,6 @@ if ~xcosPalAdd(pal) then pause, end
 if ~xcosPalAdd(pal, "my Summation blocks") then pause, end
 if ~xcosPalAdd(pal, ["Customs" "my Summation blocks"]) then pause, end
 
-export_to_hdf5(TMPDIR + "/palette.sod", "pal");
+save(TMPDIR + "/palette.sod", "pal");
 if ~xcosPalAdd(TMPDIR + "/palette.sod") then pause, end
 
index f4ede21..6a65698 100644 (file)
@@ -40,7 +40,7 @@ result = strsubst(result, '\', '/');
 if or(expectedResult <> result) then bugmes();quit;end
 // check call with a stored block instance
 pal = xcosPal();
-export_to_hdf5(blockPath, "scs_m");
+save(blockPath, "scs_m");
 pal = xcosPalAddBlock(pal, blockPath);
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR) msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
 expectedResult = strsubst(expectedResult, '\', '/');
index a5f02af..5359d37 100644 (file)
@@ -25,16 +25,16 @@ blockPath = TMPDIR + "/block.sod";
 pal = xcosPal();
 pal = xcosPalAddBlock(pal, "SUM_f");
 
-if getos() == 'Windows' then
+if getos() == "Windows" then
     root_url = "file:///";
 else
     root_url = "file://";
 end
 
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR) msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 // check call with a block instance only
@@ -42,29 +42,29 @@ pal = xcosPal();
 pal = xcosPalAddBlock(pal, scs_m);
 
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR) msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 // check call with a stored block instance
 pal = xcosPal();
-export_to_hdf5(blockPath, "scs_m");
+save(blockPath, "scs_m");
 pal = xcosPalAddBlock(pal, blockPath);
 
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR) msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 // check call with empty icon and style
 pal = xcosPal();
 pal = xcosPalAddBlock(pal, blockPath, [], []);
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR) msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 //
@@ -80,9 +80,9 @@ pal = xcosPal();
 pal = xcosPalAddBlock(pal, blockPath, "modules/xcos/images/palettes/NPN.png");
 
 expectedResult = ["SUM_f" iconPath msprintf("noLabel=1;image="+ root_url +"%s/SUM_f.svg;", TMPDIR)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 cd(current);
@@ -99,18 +99,18 @@ pal = xcosPal();
 pal = xcosPalAddBlock(pal, blockPath, [], myStyle);
 
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR)  msprintf("block;image="+ root_url +"%s;", iconPath)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 // check call with an empty icon and a path style
 pal = xcosPal();
 pal = xcosPalAddBlock(pal, blockPath, [], iconPath);
 expectedResult = ["SUM_f" msprintf("%s/SUM_f.gif", TMPDIR)  msprintf("shape=label;image="+ root_url +"%s;", iconPath)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
 // check a full call with only paths (eg for toolbox creation)
@@ -118,8 +118,8 @@ pal = xcosPal();
 pal = xcosPalAddBlock(pal, blockPath, iconPath, stylePath);
 
 expectedResult = ["SUM_f" iconPath  msprintf("shape=label;image="+ root_url +"%s;", stylePath)];
-expectedResult = strsubst(expectedResult, '\', '/');
+expectedResult = strsubst(expectedResult, "\", "/");
 result = [pal.blockNames(1) pal.icons(1) pal.style(1)];
-result = strsubst(result, '\', '/');
+result = strsubst(result, "\", "/");
 if or(expectedResult <> result) then pause, end
 
index 548c374..ea6aa39 100644 (file)
@@ -20,5 +20,5 @@ deletefile(path);
 savedPal = pal;
 assert_checktrue(xcosPalExport(pal, path));
 clear pal;
-import_from_hdf5(path);
+load(path);
 assert_checktrue(and(savedPal == pal));
index bc2c698..41ab154 100644 (file)
@@ -27,6 +27,6 @@ savedPal = pal;
 assert_checktrue(xcosPalExport(pal, path));
 
 clear pal;
-import_from_hdf5(path);
+load(path);
 assert_checktrue(and(savedPal == pal));
 
index 0a553cc..7448bd9 100644 (file)
@@ -19,7 +19,7 @@ function %diagram_xcos(scs_m)
         tempfile = TMPDIR + filesep() + "xcos_scs_m_" + string(k) + ".h5";
     end
 
-    export_to_hdf5(tempfile, "scs_m");
+    save(tempfile, "scs_m");
 
     xcos(tempfile);
 
index 2f488cd..9ce354f 100644 (file)
@@ -109,30 +109,37 @@ function importScicosPal(palFiles, outPath)
             if isfile(blockFile) then
                 //if the file already exists try to load data and compare
                 out2 = out;
-                bImport = import_from_hdf5(blockFile);
 
-                //data are identical
-                if bImport == %t & isequal(out, out2) then
-                    doExport = %f;
-                else
-                    out = out2;
+                try
+                    load(blockFile);
+                    if isequal(out, out2) then
+                        doExport = %f;
+                    else
+                        out = out2;
+                    end
+                catch
                 end
+                //data are identical
             end
 
             if doExport == %t then
                 mprintf("%d: %s\n", i, block_name);
-                bexport = export_to_hdf5(blockFile, "out");
-                if (~bexport) then
+                try
+                    save(blockFile, "out");
+                catch
                     mprintf("FAILED TO EXPORT: %s\n", out.gui);
                 end
 
                 out2 = out;
-                bImport = import_from_hdf5(blockFile);
-
-                if bImport == %f | or(out2 <> out) then
+                try
+                    load(blockFile);
+                    if or(out2 <> out) then
+                        mprintf("FAILED TO EXPORT: %s\n", out.gui);
+                    end
+                    exportedBlocks = exportedBlocks + 1;
+                catch
                     mprintf("FAILED TO EXPORT: %s\n", out.gui);
                 end
-                exportedBlocks = exportedBlocks + 1;
             end
         end
     end
index 1d87011..c536bab 100644 (file)
@@ -33,16 +33,16 @@ function xcosBlockEval(hdf5FileToLoad, hdf5FileToSave, interfaceAlias, hdf5Conte
     funcprot(%mprt)
 
     // allocate the context
-    import_from_hdf5(hdf5ContextFile);
+    load(hdf5ContextFile);
     %scicos_context = struct();
     [%scicos_context, ierr] = script2var(context, %scicos_context)
 
     // Every parameter settings is done, perform block update
 
-    import_from_hdf5(hdf5FileToLoad);
+    load(hdf5FileToLoad);
 
     //create a structure with the new context
     [new_scs_m, y, typ] = interfaceAlias("set", scs_m, []);
 
-    export_to_hdf5(hdf5FileToSave, "new_scs_m");
+    save(hdf5FileToSave, "new_scs_m");
 endfunction
index bc759b0..f112aff 100644 (file)
@@ -19,7 +19,7 @@ function xcosBlockInterface(hdf5FileToLoad, hdf5FileToSave, ...
     alreadyran = %f;
 
     // define context
-    import_from_hdf5(hdf5ContextFile);
+    load(hdf5ContextFile);
     %scicos_context = struct();
     [%scicos_context, ierr] = script2var(context, %scicos_context)
 
@@ -35,8 +35,9 @@ function xcosBlockInterface(hdf5FileToLoad, hdf5FileToSave, ...
     end
     //end of for backward compatibility for scifunc
 
-    status = import_from_hdf5(hdf5FileToLoad);
-    if ~status then
+    try
+        load(hdf5FileToLoad);
+    catch
         error(msprintf(gettext("%s: Unable to import data from %s"), "xcosBlockInterface", hdf5FileToLoad));
     end
 
@@ -44,7 +45,7 @@ function xcosBlockInterface(hdf5FileToLoad, hdf5FileToSave, ...
     if ierr <> 0 then
         [msg, err] = lasterror();
         disp(msg);
-        export_to_hdf5(hdf5FileToSave, "scs_m");
+        save(hdf5FileToSave, "scs_m");
         return;
     end
 
@@ -53,7 +54,7 @@ function xcosBlockInterface(hdf5FileToLoad, hdf5FileToSave, ...
     // no file creation).
     updated = and([needcompile == 0, and(new_scs_m == scs_m)]) <> %t;
     if updated then
-        export_to_hdf5(hdf5FileToSave, "new_scs_m");
+        save(hdf5FileToSave, "new_scs_m");
     else
         deletefile(hdf5FileToSave);
     end
index 2ae8a43..277730e 100644 (file)
@@ -21,7 +21,7 @@ function xcosCodeGeneration(hdf5FileToLoad, hdf5FileToSave)
     //-- end
 
     // This will create a scs_m variable.
-    status = import_from_hdf5(hdf5FileToLoad);
+    status = load(hdf5FileToLoad);
     if ~status then
         error(msprintf(gettext("%s: Unable to import data from %s"), "xcosCodeGeneration", hdf5FileToLoad));
     end
@@ -35,8 +35,9 @@ function xcosCodeGeneration(hdf5FileToLoad, hdf5FileToSave)
     end
 
     if ok then
-        status = export_to_hdf5(hdf5FileToSave, "XX");
-        if ~status then
+        try
+            save(hdf5FileToSave, "XX");
+        catch
             error(msprintf(gettext("%s: Unable to export ''XX'' to %s"), "xcosCodeGeneration", hdf5FileToSave));
         end
     else
index f42907f..fce53b8 100644 (file)
@@ -39,9 +39,9 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
     //  bigSomPath = TMPDIR + "/sum.h5";
     //
     //  scs_m = SUM_f("define");
-    //  export_to_hdf5(sumPath, "scs_m");
+    //  save(sumPath, "scs_m");
     //  scs_m = BIGSOM_f("define");
-    //  export_to_hdf5(bigSomPath, "scs_m");
+    //  save(bigSomPath, "scs_m");
     //
     //  pal = xcosPalAddBlock(pal, sumPath);
     //  pal = xcosPalAddBlock(pal, bigSomPath);
@@ -75,8 +75,9 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
     if typeof(block) == "Block" then
         path = TMPDIR + "/" + block.gui + ".h5";
         scs_m = block;
-        err = export_to_hdf5(path, "scs_m");
-        if err <> %T then
+        try
+            save(path, "scs_m");
+        catch
             error(msprintf(gettext("%s: Unable to export ""%s"" to ""%s"".\n"), "xcosPalAddBlock", "block", path));
         end
 
@@ -87,8 +88,9 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
         if exists(block) <> 0 & typeof(evstr(block)) == "function" then
             execstr("scs_m = " + block + "(""define"");");
             path = TMPDIR + "/" + block + ".h5";
-            err = export_to_hdf5(path, "scs_m");
-            if err <> %T then
+            try
+                save(path, "scs_m");
+            catch
                 error(msprintf(gettext("%s: Unable to export ""%s"" to ""%s"".\n"), "xcosPalAddBlock", "block", path));
             end
 
@@ -104,7 +106,7 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
 
             // store the block instance if not already saved
             if exists("scs_m", "l") == 0 then
-                status = import_from_hdf5(block);
+                status = load(block);
                 if ~status then
                     error(msprintf(gettext("%s: Unable to load block from ""%s"": hdf5 file expected.\n"), "xcosPalAddBlock", block));
                 end
@@ -174,6 +176,7 @@ function pal = xcosPalAddBlock(pal, block, pal_block_img, style)
                 //              assume a well formatted string, do nothing
             end
         end
+
     end
 
     // Store the data into the palette structure
index 5e30b7b..210e82a 100644 (file)
@@ -42,9 +42,9 @@ function [status, msg] = xcosPalExport(pal, path)
     //   bigSomPath = TMPDIR + "/sum.h5";
     //
     //   scs_m = SUM_f("define");
-    //   export_to_hdf5(sumPath, "scs_m");
+    //   save(sumPath, "scs_m");
     //   scs_m = BIGSOM("define");
-    //   export_to_hdf5(bigSomPath, "scs_m");
+    //   save(bigSomPath, "scs_m");
     //
     //   pal = xcosPalAddBlock(pal, sumPath);
     //   pal = xcosPalAddBlock(pal, bigSomPath);
@@ -90,8 +90,9 @@ function [status, msg] = xcosPalExport(pal, path)
 
     // export the data to the temp file
     pal = pal; // #7242 workaround
-    status = export_to_hdf5(path, "pal");
-    if ~status then
+    try
+        save(path, "pal");
+    catch
         msg = msprintf(gettext("%s: Unable to export the palette to hdf5.\n"), "xcosPalExport");
         if  lhs == 1 then
             error(msg);