Changeset 672 for cpp/frams

Timestamp:

08/18/17 22:08:42 (7 years ago)

Author:

Maciej Komosinski

Message:

More appropriate name for the "model_energy_max" variable

File:

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

cpp/frams/genetics/f1/conv_f1.cpp

@@ -18 +18 @@
 {
 public:
-        Builder(const char*g, int mapping = 0) :invalid(0), genbegin(g), usemapping(mapping), first_part_mapping(NULL), model_energy(0), model_energy_max(0) {}
+        Builder(const char*g, int mapping = 0) :invalid(0), genbegin(g), usemapping(mapping), first_part_mapping(NULL), model_energy(0), model_energy_count(0) {}
         ~Builder() { SAFEDELETE(first_part_mapping); }
         char tmp[222];
@@ -39 +39 @@
         MultiRange *first_part_mapping;
         double lastjoint_muscle_power;
-        double model_energy, model_energy_max;
+        double model_energy;
+        int model_energy_count;
         void grow(int part1, const char*g, Pt3D k, F1Props c);
         void setPartMapping(int p, const char* g);
@@ -111 +112 @@
         if (builder.invalid) return SString();
         builder.addPendingInputs();
-        builder.model.startenergy = (builder.model_energy_max > 0) ? (builder.model_energy / builder.model_energy_max) : 1.0;
+        builder.model.startenergy = (builder.model_energy_count > 0) ? (builder.model_energy / builder.model_energy_count) : 1.0;
         builder.model.close(); // model is ready to use now
         if (map) builder.model.getCurrentToF0Map(*map); // generate f1-to-f0 conversion map
@@ -209 +210 @@
                         }
                         model_energy += 0.9*c.energy + 0.1;
-                        model_energy_max += 1.0;
+                        model_energy_count++;
 
                         int part2 = growPart(c, g);