Changeset 1065 for cpp/frams

Timestamp:

01/27/21 12:20:00 (4 years ago)

Author:

Maciej Komosinski

Message:

More specific error messages

File:

• cpp/frams/model/similarity/simil-measure-base.cpp (modified) (3 diffs)

cpp/frams/model/similarity/simil-measure-base.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -26 +26 @@
         models[1] = newModel(genos[1]);
 
+        if (models[0] == NULL)
+                logPrintf("SimilMeasureBase", "evaluateDistance", LOG_ERROR, "Unable to create a Model from genotype '%s'.", G0->getGenes().c_str());
+        if (models[1] == NULL)
+                logPrintf("SimilMeasureBase", "evaluateDistance", LOG_ERROR, "Unable to create a Model from genotype '%s'.", G1->getGenes().c_str());
         if (models[0] == NULL || models[1] == NULL)
-        {
-                logPrintf("SimilarityMeasure", "EvaluateDistance", LOG_ERROR, "Unable to create model from one of the genotypes.");
                 return -1;
-        }
-        
+
         double distance = getDistance();
         SAFEDELETE(models[0]);
@@ -67 +68 @@
 Model SimilMeasureBase::sampleSurface(Model* M, double density)
 {
-    Model resultModel;
-    resultModel.open();
-    GeometryUtils::addAnchorToModel(resultModel);
+        Model resultModel;
+        resultModel.open();
+        GeometryUtils::addAnchorToModel(resultModel);
 
-    MeshBuilder::ModelSurface iterator(density);
-    iterator.initialize(M);
+        MeshBuilder::ModelSurface iterator(density);
+        iterator.initialize(M);
 
-    Pt3D point;
-    while (iterator.tryGetNext(point))
-    {
-        GeometryUtils::addPointToModel(point, resultModel);
-    }
+        Pt3D point;
+        while (iterator.tryGetNext(point))
+        {
+                GeometryUtils::addPointToModel(point, resultModel);
+        }
 
-    resultModel.close();
-    return resultModel;
+        resultModel.close();
+        return resultModel;
 }