Changeset 82 for cpp/gdk/model.cpp

Timestamp:

02/08/13 03:44:31 (11 years ago)

Author:

Maciej Komosinski

Message:

compiles under more platforms and OSes

File:

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

cpp/gdk/model.cpp

@@ -3 +3 @@
 // Refer to http://www.framsticks.com/ for further information.
 
-#include "nonstd.h"
+#include "nonstd_math.h"
 #include "model.h"
 #include "framsg.h"
 #include "multimap.h"
 #include "errmanager.h"
-
-#include <math.h>
 
 #define FIELDSTRUCT Model
@@ -384 +382 @@
 }
 
-void Model::makeGeno(Geno &g,MultiMap *map)
+void Model::makeGeno(Geno &g,MultiMap *map,bool handle_defaults)
 {
 if ((buildstatus!=valid)&&(buildstatus!=building))
@@ -419 +417 @@
         modelparam.select(this);
         gen+="m:";
-        modelparam.save2(gen,&defaultmodel);
+        modelparam.save2(gen,handle_defaults ? &defaultmodel : NULL,true,!handle_defaults);
         }
 
@@ -427 +425 @@
         len=gen.len();
         gen+="p:";
-        partparam.save2(gen,&defaultpart);
+        partparam.save2(gen,handle_defaults ? &defaultpart : NULL,true,!handle_defaults);
         if (map)
                 map->add(len,gen.len()-1,partToMap(i));
@@ -437 +435 @@
         jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
         gen+="j:";
-        jointparam.save2(gen,&defaultjoint);
+        jointparam.save2(gen,handle_defaults ? &defaultjoint : NULL,true,!handle_defaults);
         if (map)
                 map->add(len,gen.len()-1,jointToMap(i));
@@ -446 +444 @@
         len=gen.len();
         gen+="n:";
-        neuroparam.save2(gen,&defaultneuro);
+        neuroparam.save2(gen,handle_defaults ? &defaultneuro : NULL,true,!handle_defaults);
         if (map)
                 map->add(len,gen.len()-1,neuroToMap(i));
@@ -477 +475 @@
                 len=gen.len();
                 gen+="c:";
-                connparam.save2(gen,&defaultconn);
+                connparam.save2(gen,handle_defaults ? &defaultconn : NULL,true,!handle_defaults);
                 if (map)
                         map->add(len,gen.len()-1,neuroToMap(n->refno));