Changeset 361 for cpp/frams/model/similarity/simil_model.cpp

Timestamp:

04/18/15 17:31:31 (9 years ago)

Author:

Maciej Komosinski

Message:

Signed/unsigned int issues (r352) resolved differently - in most cases no (int)size() cast

File:

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

cpp/frams/model/similarity/simil_model.cpp

@@ -734 +734 @@
                 {
                     GetNeighbIndexes(mod, partInd, nIndexes);
-                    for (int k = 0; k < (int) nIndexes.size(); k++)
+                                        for (unsigned int k = 0; k < nIndexes.size(); k++)
                     {
                         newDeg += m_fuzzyNeighb[mod][nIndexes.at(k)][depth - 1];
@@ -1722 +1722 @@
         // wartości orginalne transformacji dOrig uzyskuje się przez:
         // for ( iTrans = 0; iTrans <= TRANS_INDEX; iTrans++ ) dOrig *= dMul[ iTrans ];
+        //const char *szTransformNames[NO_OF_TRANSFORM] = { "ID", "S_yz", "S_xz", "S_xy", "R180_z", "R180_y", "R180_z", "S_(0,0,0)" };
         const int dMulX[ NO_OF_TRANSFORM ] = {1, -1, -1, 1, -1, 1, -1, -1};
         const int dMulY[ NO_OF_TRANSFORM ] = {1, 1, -1, -1, -1, -1, -1, 1};
         const int dMulZ[ NO_OF_TRANSFORM ] = {1, 1, 1, -1, -1, -1, 1, 1};
 
-#undef max
+#ifdef max
+ #undef max //this macro would conflict with line below
+#endif
         double dMinSimValue = std::numeric_limits<double>::max(); // minimum value of similarity
         int iMinSimTransform = -1; // index of the transformation with the minimum similarity