Changeset 745 for cpp/frams

Timestamp:

02/27/18 17:12:25 (7 years ago)

Author:

Maciej Komosinski

Message:

Renamed ParamInterface::save() -> saveMultiLine()

Location:

cpp/frams

Files:

• _demos/loader_test_param.cpp (modified) (2 diffs)
• _demos/multiline_f0_test.cpp (modified) (6 diffs)
• _demos/saver_test_geno.cpp (modified) (1 diff)
• param/param.cpp (modified) (1 diff)
• param/param.h (modified) (1 diff)
• param/paramobj.h (modified) (1 diff)

cpp/frams/_demos/loader_test_param.cpp

@@ -51 +51 @@
         { "notchanged", 0, PARAM_READONLY, "Read only field", "d", FIELD(notchanged), }, // neither load() nor setDefault() can change this field
         { "notloaded", 0, PARAM_DONTLOAD, "Non-loadable field", "d", FIELD(notloaded), }, // load() does not change this field
-        { "notsaved", 0, PARAM_DONTSAVE, "Non-saveable field", "d", FIELD(notsaved), }, // save() skips this field
+        { "notsaved", 0, PARAM_DONTSAVE, "Non-saveable field", "d", FIELD(notsaved), }, // saveSingle/MultiLine() skips this field
         { 0, 0, 0, },
 };
@@ -102 +102 @@
                         fprintf(stderr, "type of 'x2' is: %s\n", data.x2.typeDescription().c_str());
                         fprintf(stderr, "-----\n\n");
-                        param.save(&virt_stdout);
+                        param.saveMultiLine(&virt_stdout);
                         break;
 

cpp/frams/_demos/multiline_f0_test.cpp

@@ -39 +39 @@
 printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
 
-printf("\nusing Param::save() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");
+printf("\nusing Param::saveMultiLine() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");
 
 StringFILE2 f;
@@ -50 +50 @@
 
 modelparam.select(&m);
-modelparam.save(&f,"m");
+modelparam.saveMultiLine(&f,"m");
 
 Part *p;
@@ -59 +59 @@
         {
         partparam.select(p);
-        partparam.save(&f,"p");
+        partparam.saveMultiLine(&f,"p");
         }
 for (int i=0;j=(Joint*)m.getJoint(i);i++)
@@ -65 +65 @@
         jointparam.select(j);
         jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
-        jointparam.save(&f,"j");
+        jointparam.saveMultiLine(&f,"j");
         }
 for (int i=0;n=(Neuro*)m.getNeuro(i);i++)
         {
         neuroparam.select(n);
-        neuroparam.save(&f,"n");
+        neuroparam.saveMultiLine(&f,"n");
         }
 for (int a=0;n=(Neuro*)m.getNeuro(a);a++)
@@ -83 +83 @@
                 nc.info=n->getInputInfo(b);
                 connparam.select(&nc);
-                connparam.save(&f,"c");
+                connparam.saveMultiLine(&f,"c");
                 }
         }
@@ -107 +107 @@
 
 
-using Param::save() to create the "expanded" form of the f0 genotype...
+using Param::saveMultiLine() to create the "expanded" form of the f0 genotype...
 (MultiParamLoader should be able to load this)
 ============================

cpp/frams/_demos/saver_test_geno.cpp

@@ -40 +40 @@
                         g.info = "Saved by saver_test_geno.cpp";
                         g.is_valid = 1;
-                        p.save(f, "org");
+                        p.saveMultiLine(f, "org");
                 }
                 delete f;

cpp/frams/param/param.cpp

@@ -275 +275 @@
 }
 
-int ParamInterface::save(VirtFILE* f, const char* altname, bool force)
+int ParamInterface::saveMultiLine(VirtFILE* f, const char* altname, bool force)
 {
         const char *p;

cpp/frams/param/param.h

@@ -176 +176 @@
         };
 
-        int save(VirtFILE*, const char* altname = NULL, bool force = 0);
+        int saveMultiLine(VirtFILE*, const char* altname = NULL, bool force = 0);
         int saveprop(VirtFILE*, int i, const char* p, bool force = 0);
 

cpp/frams/param/paramobj.h

@@ -47 +47 @@
                 void* obj2=ParamObject::makeObject(tab);
                 Param par(tab,obj);
-                par.set(...), par.get(...), par.load(...), par.save(...);
+                par.set(...), par.get(...), par.load(...), par.saveSingle/MultiLine(...);
                 par.select(obj);
                 par.select(obj2);