Changeset 726 for cpp/frams/genetics/f1

Timestamp:

01/19/18 19:37:43 (7 years ago)

Author:

Maciej Komosinski

Message:

• Changed Model::singleStepBuild() to Model::addFromString() to create model elements; the latter requires explicit indication of element type (P/J/N/C)
• Removed old compatibility source (#ifdef MODEL_V1_COMPATIBLE) from f1->f0 converter and neuron definitions

File:

• cpp/frams/genetics/f1/conv_f1.cpp (modified) (2 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -111 +111 @@
         Builder builder(g, map ? 1 : 0);
         builder.model.open();
-        builder.grow(-1, g, Pt3D_0, stdprops, -1); // uses Model::singleStepBuild to create model elements
+        builder.grow(-1, g, Pt3D_0, stdprops, -1); // uses Model::addFromString() to create model elements
         if (builder.invalid) return SString();
         builder.addPendingInputs();
@@ -323 +323 @@
 {
         double len = min(2.0, c.length);
-        sprintf(tmp, "j:p1=%ld,p2=%ld,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
+        sprintf(tmp, "p1=%ld,p2=%ld,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
                 part1, part2, len, angle.x, angle.y, angle.z, c.stamina, c.cred, c.cgreen, c.cblue);
         lastjoint_muscle_power = c.muscle_power;
-        return model.singleStepBuild(tmp, makeRange(g));
+        return model.addFromString(Model::JointType, tmp, makeRange(g));
 }
 
 int Builder::growPart(F1Props &c, const char *g)
 {
-        sprintf(tmp, "p:dn=%lg,fr=%lg,ing=%lg,as=%lg,vs=%g,vr=%g,vg=%g,vb=%g",
+        sprintf(tmp, "dn=%lg,fr=%lg,ing=%lg,as=%lg,vs=%g,vr=%g,vg=%g,vb=%g",
                 1.0 / c.weight, c.friction, c.ingestion, c.assimilation, c.visual_size, c.cred, c.cgreen, c.cblue);
-        return model.singleStepBuild(tmp, makeRange(g));
+        return model.addFromString(Model::PartType, tmp, makeRange(g));
 }