Changeset 1056 for cpp/frams/genetics/fS/fS_general.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

Cosmetic

File:

• cpp/frams/genetics/fS/fS_general.cpp (modified) (3 diffs)

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;