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

Timestamp:

04/17/15 00:51:37 (9 years ago)

Author:

oriona

Message:

comparison between signed and unsigned integer expressions fixed

File:

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

cpp/frams/model/similarity/simil_model.cpp

@@ -735 +735 @@
                 {
                     GetNeighbIndexes(mod, partInd, nIndexes);
-                    for (int k = 0; k < nIndexes.size(); k++)
+                    for (int k = 0; k < (int) nIndexes.size(); k++)
                     {
                         newDeg += m_fuzzyNeighb[mod][nIndexes.at(k)][depth - 1];
@@ -1680 +1680 @@
 int ModelSimil::MatchPartsGeometry()
 {
-    // uniwersalne liczniki
-    int i, j;
-
     // zaloz, ze sa modele i sa poprawne
     assert((m_Mod[0] != NULL) && (m_Mod[1] != NULL));
@@ -1726 +1723 @@
         // 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};