Changeset 157 for cpp/frams/genetics/fF

Timestamp:

03/01/14 22:38:45 (11 years ago)

Author:

sz

Message:

f9 and Ff converters can now detect an invalid input genotype and react appropriately

File:

• cpp/frams/genetics/fF/conv_fF.cpp (modified) (2 diffs)

cpp/frams/genetics/fF/conv_fF.cpp

@@ -19 +19 @@
 {
         fF_growth_params gp;
-        gp.load(in);
+        if (!gp.load(in)) //invalid input genotype?
+                return ""; //so we return an invalid f0 genotype
         Model m;
         m.open();
@@ -31 +32 @@
         rotation.rotate(Pt3D(0, gp.angle1, gp.angle2)); //assumed rotation around x is 0, which is limiting if we use assymetrical shapes (i.e., not spheres). But the original model had only two angles...
 
-        for (int i = 0; i < gp.number_of_chambers; i++, p1 = p2)
+        for (int i = 1; i < gp.number_of_chambers; i++, p1 = p2)
         {
                 p2 = m.addNewPart(Part::SHAPE_ELLIPSOID);