Ignore:
Timestamp:
12/28/20 02:06:52 (2 months ago)
Author:
Maciej Komosinski
Message:

Cosmetic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fS/fS_general.cpp

    r1032 r1056  
    1212#include "../genooperators.h"
    1313#include "common/nonstd_math.h"
    14 #include "../../model/geometry/part_distance_estimator.h"
     14#include <frams/model/geometry/part_distance_estimator.h>
    1515
    1616int fS_Genotype::precision = 4;
     
    482482        Pt3D scale;
    483483        calculateScale(scale);
    484         return GeometryUtils::isSolidPartScaleValid(partShape, scale);
     484        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?
    485485}
    486486
     
    910910        Part *parentTmpPart = PartDistanceEstimator::buildTemporaryPart(parent->partShape, parentScale, parent->getRotation());
    911911
    912         double result;
    913912        tmpPart->p = state->v;
    914         result = PartDistanceEstimator::calculateDistance(*tmpPart, *parentTmpPart, genotypeParams.distanceTolerance, genotypeParams.relativeDensity);
    915 
     913        double result = PartDistanceEstimator::calculateDistance(*tmpPart, *parentTmpPart, genotypeParams.distanceTolerance, genotypeParams.relativeDensity);
    916914
    917915        delete tmpPart;
Note: See TracChangeset for help on using the changeset viewer.