Changeset 361 for cpp/frams/_demos

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/_demos/simil_test.cpp (modified) (4 diffs)

cpp/frams/_demos/simil_test.cpp

@@ -36 +36 @@
     ...
     <row_n>
-
-    Last modified: 2015-04-16
  */
 int main(int argc, char *argv[])
@@ -160 +158 @@
     // create the empty array of similarities
     aaSimil = new pDouble [pvGenos->size()];
-    for (int k = 0; k < (int) pvGenos->size(); k++)
+    for (unsigned int k = 0; k < pvGenos->size(); k++)
     {
         aaSimil[k] = new double [pvGenos->size()];
-        for (int l = 0; l < (int) pvGenos->size(); l++)
+                for (unsigned int l = 0; l < pvGenos->size(); l++)
             aaSimil[k][l] = 0.0;
     }
 
     // compute and remember similarities
-    int i, j;
-    for (i = 0; i < (int) pvGenos->size(); i++)
-    {
-        for (j = 0; j < (int) pvGenos->size(); j++)
+        for (unsigned int i = 0; i < pvGenos->size(); i++)
+    {
+                for (unsigned int j = 0; j < pvGenos->size(); j++)
         {
             dSimilarity = M.EvaluateDistance(pvGenos->operator[](i), pvGenos->operator[](j));
@@ -183 +180 @@
         // print the number of genotypes and their names
         printf("%li\n", pvGenos->size());
-        int iGen;
-        for (iGen = 0; iGen < (int) pvNames->size(); iGen++)
+                for (unsigned int iGen = 0; iGen < pvNames->size(); iGen++)
         {
             printf("%s\n", pvNames->at(iGen));
         }
-    } // if (bPrintNames)
+    }
 
     // print out the matrix of similarities
-    for (i = 0; i < (int) pvGenos->size(); i++)
-    {
-        for (j = 0; j < (int) pvGenos->size(); j++)
+        for (unsigned int i = 0; i < pvGenos->size(); i++)
+    {
+                for (unsigned int j = 0; j < pvGenos->size(); j++)
         {
             printf("%.2lf\t", aaSimil[i][j]);
@@ -201 +197 @@
 
     // delete vectors and arrays
-    for (i = 0; i < (int) pvGenos->size(); i++)
+        for (unsigned int i = 0; i < pvGenos->size(); i++)
     {
         delete pvGenos->operator[](i);