Changeset 1056 for cpp/frams/genetics/fS

Timestamp:

12/28/20 02:06:52 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp/frams/genetics/fS

Files:

• fS_general.cpp (modified) (3 diffs)
• fS_oper.cpp (modified) (1 diff)
• fS_oper.h (modified) (1 diff)

cpp/frams/genetics/fS/fS_general.cpp

@@ -12 +12 @@
 #include "../genooperators.h"
 #include "common/nonstd_math.h"
-#include "../../model/geometry/part_distance_estimator.h"
+#include <frams/model/geometry/part_distance_estimator.h>
 
 int fS_Genotype::precision = 4;
@@ -482 +482 @@
         Pt3D scale;
         calculateScale(scale);
-        return GeometryUtils::isSolidPartScaleValid(partShape, scale);
+        return GeometryUtils::isSolidPartScaleValid(partShape, scale, true); //2020-12: mac->JS: I set the last argument to true because this is how the original code worked, but I think it should be ensureCircleSection?
 }
 
@@ -910 +910 @@
         Part *parentTmpPart = PartDistanceEstimator::buildTemporaryPart(parent->partShape, parentScale, parent->getRotation());
 
-        double result;
         tmpPart->p = state->v;
-        result = PartDistanceEstimator::calculateDistance(*tmpPart, *parentTmpPart, genotypeParams.distanceTolerance, genotypeParams.relativeDensity);
-
+        double result = PartDistanceEstimator::calculateDistance(*tmpPart, *parentTmpPart, genotypeParams.distanceTolerance, genotypeParams.relativeDensity);
 
         delete tmpPart;

cpp/frams/genetics/fS/fS_oper.cpp

@@ -339 +339 @@
         {
                 geno.getState(false);
-                mutateScaleParam(newNode, SCALE_X, true);
+                mutateScaleParam(newNode, SCALE_X, true); //TODO 2020-12: mac->JS: should be true or rather ensureCircleSection?
                 mutateScaleParam(newNode, SCALE_Y, true);
                 mutateScaleParam(newNode, SCALE_Z, true);

cpp/frams/genetics/fS/fS_oper.h

@@ -142 +142 @@
 
         /**
-         * Change the value of the scale parameter by given multiplier
-         * Do not change the value if any of the scale restrictions is not satisfied
+         * Change the value of the scale parameter by a given multiplier.
+         * Do not change the value if any of the scale restrictions is not satisfied.
          * @param paramKey
          * @param multiplier
          * @param ensureCircleSection
-         * @return True if the parameter value was change, false otherwise
+         * @return True if the parameter value was changed, false otherwise
          */
         bool mutateScaleParam(Node *node, string key, bool ensureCircleSection);