Changeset 720 for cpp/frams/_demos

Timestamp:

01/14/18 11:24:22 (7 years ago)

Author:

Maciej Komosinski

Message:

Param::save2() renamed to saveSingleLine(); unified Param::load() so that it gets a single-line/multi-line format selector

File:

• cpp/frams/_demos/f0_variants_test.cpp (modified) (7 diffs)

cpp/frams/_demos/f0_variants_test.cpp

@@ -30 +30 @@
 modelparam.select(&m);
 gen+="m:";
-modelparam.save2(gen,omit_default_values ? &defaultmodel : NULL);
+modelparam.saveSingleLine(gen,omit_default_values ? &defaultmodel : NULL);
 
 Part *p;
@@ -40 +40 @@
         partparam.select(p);
         gen+="p:";
-        partparam.save2(gen,omit_default_values ? &defaultpart : NULL);
+        partparam.saveSingleLine(gen,omit_default_values ? &defaultpart : NULL);
         }
 for (int i=0;j=(Joint*)m.getJoint(i);i++)
@@ -47 +47 @@
         jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
         gen+="j:";
-        jointparam.save2(gen,omit_default_values ? &defaultjoint : NULL);
+        jointparam.saveSingleLine(gen,omit_default_values ? &defaultjoint : NULL);
         }
 for (int i=0;n=(Neuro*)m.getNeuro(i);i++)
@@ -53 +53 @@
         neuroparam.select(n);
         gen+="n:";
-        neuroparam.save2(gen,omit_default_values ? &defaultneuro : NULL);
+        neuroparam.saveSingleLine(gen,omit_default_values ? &defaultneuro : NULL);
         }
 for (int a=0;n=(Neuro*)m.getNeuro(a);a++)
@@ -67 +67 @@
                 connparam.select(&nc);
                 gen+="c:";
-                connparam.save2(gen,omit_default_values ? &defaultconn : NULL);
+                connparam.saveSingleLine(gen,omit_default_values ? &defaultconn : NULL);
                 }
         }
@@ -106 +106 @@
         }
 
-printf("\nthis example shows how to save a f0 genotype using low-level ParamInterface::save2() calls\n");
+printf("\nthis example shows how to save a f0 genotype using low-level ParamInterface::saveSingleLine() calls\n");
 
 SString f0_skipping_defaults;
@@ -125 +125 @@
                   ( format 1 )
 
-this example shows how to save a f0 genotype using low-level ParamInterface::save2() calls
+this example shows how to save a f0 genotype using low-level ParamInterface::saveSingleLine() calls
 
 ==== with defdata (skips default values) ======