Changeset 739 for cpp/frams/_demos/genoconv_test.cpp

Timestamp:

02/18/18 02:54:36 (6 years ago)

Author:

Maciej Komosinski

Message:

Unlimited number of model Parts/Joints/Neurons? when displaying the genotype-to-phenotype mapping

File:

• cpp/frams/_demos/genoconv_test.cpp (modified) (2 diffs)

cpp/frams/_demos/genoconv_test.cpp

@@ -116 +116 @@
 }
 
+static int goodWidthForFormat(int genotype_format)
+{
+        return genotype_format == '0' ? 45 : 15; // more space for long f0 lines
+}
+
 // arguments:
 //     genotype (or - meaning "read from stdin") [default: X]
@@ -182 +187 @@
                         printf("Conversion map:\n");
                         m.print();
-                        printConvMap(g1.getGenes(), g2.getGenes(), m);
+                        printConvMap(g1.getGenes(), g2.getGenes(), m, goodWidthForFormat(g1.getFormat()));
                         printf("Reverse conversion map:\n");
                         MultiMap rm;
                         rm.addReversed(m);
                         rm.print();
-                        printConvMap(g2.getGenes(), g1.getGenes(), rm);
+                        printConvMap(g2.getGenes(), g1.getGenes(), rm, goodWidthForFormat(g2.getFormat()));
                 }
 
                 Model mod1(g1, 1);
                 printf("\nModel map for f%c genotype:\n", g1.getFormat());
-                printModelMap(g1.getGenes(), mod1.getMap());
+                ModelDisplayMap dm1(mod1);
+                dm1.print(goodWidthForFormat(g1.getFormat()));
                 MultiMap mod1combined;
-                mod1combined.addCombined(mod1.getMap(), getModelDisplayMap());
+                mod1combined.addCombined(mod1.getMap(), dm1.getMap());
                 mod1combined.print();
                 Model mod2(g2, 1);
                 printf("\nModel map for f%c genotype:\n", g2.getFormat());
-                printModelMap(g2.getGenes(), mod2.getMap());
+                ModelDisplayMap dm2(mod2);
+                dm2.print(goodWidthForFormat(g2.getFormat()));
                 MultiMap mod2combined;
-                mod2combined.addCombined(mod2.getMap(), getModelDisplayMap());
+                mod2combined.addCombined(mod2.getMap(), dm2.getMap());
                 mod2combined.print();
         }