Changeset 104 for cpp/gdk/model.cpp

Timestamp:

07/23/13 18:15:30 (11 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/model.cpp (modified) (8 diffs)

cpp/gdk/model.cpp

@@ -382 +382 @@
 SString gen;
 
-static Param modelparam(f0_model_paramtab);
-static Param partparam(f0_part_paramtab);
-static Param jointparam(f0_joint_paramtab);
-static Param neuroparam(f0_neuro_paramtab);
-static Param connparam(f0_neuroconn_paramtab);
+Param modelparam(f0_model_paramtab);
+Param partparam(f0_part_paramtab);
+Param jointparam(f0_joint_paramtab);
+Param neuroparam(f0_neuro_paramtab);
+Param connparam(f0_neuroconn_paramtab);
 
 static Part defaultpart;
@@ -563 +563 @@
 if (!strncmp(t,"p:",2))
         {
-        static Param partparam(f0_part_paramtab);
+        Param partparam(f0_part_paramtab);
         Part *p=new Part();
         partparam.select(p);
@@ -576 +576 @@
 if (!strncmp(t,"m:",2))
         {
-        static Param modelparam(f0_model_paramtab);
+        Param modelparam(f0_model_paramtab);
         modelparam.select(this);
         pos+=2;
@@ -584 +584 @@
 else if (!strncmp(t,"j:",2))
         {
-        static Param jointparam(f0_joint_paramtab);
+        Param jointparam(f0_joint_paramtab);
         Joint *j=new Joint();
         jointparam.select(j);
@@ -610 +610 @@
 else if (!strncmp(t,"n:",2)) // neuro (or the old neuro object as the special case)
         {
-        static Param neuroparam(f0_neuro_paramtab);
+        Param neuroparam(f0_neuro_paramtab);
         Neuro *nu=new Neuro();
         neuroparam.select(nu);
@@ -674 +674 @@
 else if (!strncmp(t,"c:",2)) // add input
         {
-        static Param ncparam(f0_neuroconn_paramtab);
+        Param ncparam(f0_neuroconn_paramtab);
         NeuroConn c;
         ncparam.select(&c);
@@ -696 +696 @@
         {
         // we always use old layout for "ni:"
-        static Param neuroitemparam(f0_neuroitem_paramtab);
+        Param neuroitemparam(f0_neuroitem_paramtab);
         Neuro *nu=new Neuro();
         neuroitemparam.select(nu);
@@ -1085 +1085 @@
 }
 
-const Geno& Model::getF0Geno()
-{
-static Geno invalidgeno("",'0',"","invalid");
+const Geno Model::getF0Geno()
+{
 if (buildstatus==building)
         FMprintf("Model","getGeno",FMLV_WARN,"model was not completed - missing close()");
 if (buildstatus!=valid)
-        return invalidgeno;
+        return Geno("",'0',"","invalid");
 if (!f0genoknown)
         {