Changeset 972 for cpp/frams/model/similarity

Timestamp:

07/03/20 00:32:23 (5 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

• cpp/frams/model/similarity/simil_model.cpp (modified) (7 diffs)

cpp/frams/model/similarity/simil_model.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -122 +122 @@
 
         // assign matching function
-        int (ModelSimil::* pfMatchingFunction) () = NULL;
+        int (ModelSimil:: * pfMatchingFunction) () = NULL;
 
         pfMatchingFunction = &ModelSimil::MatchPartsGeometry;
@@ -534 +534 @@
                 return NULL;
         }
-        Model *m = new Model(*g);
+        Model *m = new Model(*g, Model::SHAPE_UNKNOWN);
         if (!m->isValid())
         {
@@ -2058 +2058 @@
                         {
                                 if (geo)
-                                        dist[i*bigger + j] += m_adFactors[3] * m_aPositions[1 - m_iSmaller][i].length();
+                                        dist[i * bigger + j] += m_adFactors[3] * m_aPositions[1 - m_iSmaller][i].length();
                                 else
-                                        dist[i*bigger + j] = m_adFactors[1] * m_aDegrees[1 - m_iSmaller][i][DEGREE] + m_adFactors[2] * m_aDegrees[1 - m_iSmaller][i][NEURONS];
+                                        dist[i * bigger + j] = m_adFactors[1] * m_aDegrees[1 - m_iSmaller][i][DEGREE] + m_adFactors[2] * m_aDegrees[1 - m_iSmaller][i][NEURONS];
                         }
                         // compute distance between parts
@@ -2066 +2066 @@
                         {
                                 if (geo)
-                                        dist[i*bigger + j] += m_adFactors[3] * m_aPositions[1 - m_iSmaller][i].distanceTo(m_aPositions[m_iSmaller][j]);
+                                        dist[i * bigger + j] += m_adFactors[3] * m_aPositions[1 - m_iSmaller][i].distanceTo(m_aPositions[m_iSmaller][j]);
                                 else
-                                        dist[i*bigger + j] = m_adFactors[1] * abs(m_aDegrees[1 - m_iSmaller][i][DEGREE] - m_aDegrees[m_iSmaller][j][DEGREE])
+                                        dist[i * bigger + j] = m_adFactors[1] * abs(m_aDegrees[1 - m_iSmaller][i][DEGREE] - m_aDegrees[m_iSmaller][j][DEGREE])
                                         + m_adFactors[2] * abs(m_aDegrees[1 - m_iSmaller][i][NEURONS] - m_aDegrees[m_iSmaller][j][NEURONS]);
                         }
@@ -2104 +2104 @@
         int nBigger = m_Mod[1 - m_iSmaller]->getPartCount();
 
-        double* partsDistances = new double[nBigger*nBigger]();
+        double* partsDistances = new double[nBigger * nBigger]();
         FillPartsDistances(partsDistances, nBigger, nSmaller, false);
         int *assignment = new int[nBigger]();
@@ -2138 +2138 @@
                         // - models (m_Mod) exist and are available
                         // - all properties are created and available (m_aDegrees and m_aPositions)
-                        double* tmpPartsDistances = new double[nBigger*nBigger]();
+                        double* tmpPartsDistances = new double[nBigger * nBigger]();
                         std::copy(partsDistances, partsDistances + nBigger * nBigger, tmpPartsDistances);
                         // recompute geometric properties according to the transformation iTransform