Changeset 352 for cpp/frams/_demos/simil_test.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/_demos/simil_test.cpp (modified) (5 diffs)

cpp/frams/_demos/simil_test.cpp

@@ -97 +97 @@
     }
 
-    char *params[] = {"<w_dP>", "<w_dDEG>", "<w_dNEU>", "<w_dGEO>"};
+    const char *params[] = {"<w_dP>", "<w_dDEG>", "<w_dNEU>", "<w_dGEO>"};
     for (int i = 0; i < M.GetNOFactors(); i++)
     {
@@ -160 +160 @@
     // create the empty array of similarities
     aaSimil = new pDouble [pvGenos->size()];
-    for (unsigned int k = 0; k < pvGenos->size(); k++)
+    for (int k = 0; k < (int) pvGenos->size(); k++)
     {
         aaSimil[k] = new double [pvGenos->size()];
-        for (unsigned int l = 0; l < pvGenos->size(); l++)
+        for (int l = 0; l < (int) pvGenos->size(); l++)
             aaSimil[k][l] = 0.0;
     }
 
     // compute and remember similarities
-    unsigned int i, j;
-    for (i = 0; i < pvGenos->size(); i++)
-    {
-        for (j = 0; j < pvGenos->size(); j++)
+    int i, j;
+    for (i = 0; i < (int) pvGenos->size(); i++)
+    {
+        for (j = 0; j < (int) pvGenos->size(); j++)
         {
             dSimilarity = M.EvaluateDistance(pvGenos->operator[](i), pvGenos->operator[](j));
@@ -183 +183 @@
         // print the number of genotypes and their names
         printf("%li\n", pvGenos->size());
-        unsigned int iGen;
-        for (iGen = 0; iGen < pvNames->size(); iGen++)
+        int iGen;
+        for (iGen = 0; iGen < (int) pvNames->size(); iGen++)
         {
             printf("%s\n", pvNames->at(iGen));
@@ -191 +191 @@
 
     // print out the matrix of similarities
-    for (i = 0; i < pvGenos->size(); i++)
-    {
-        for (j = 0; j < pvGenos->size(); j++)
+    for (i = 0; i < (int) pvGenos->size(); i++)
+    {
+        for (j = 0; j < (int) pvGenos->size(); j++)
         {
             printf("%.2lf\t", aaSimil[i][j]);
@@ -201 +201 @@
 
     // delete vectors and arrays
-    for (i = 0; i < pvGenos->size(); i++)
+    for (i = 0; i < (int) pvGenos->size(); i++)
     {
         delete pvGenos->operator[](i);