Changeset 455 for cpp/frams/_demos

Timestamp:

12/05/15 18:31:38 (9 years ago)

Author:

oriona

Message:

Malloc/free replaced by new/delete, pointers-to-vectors changed into vectors.

File:

• cpp/frams/_demos/simil_test.cpp (modified) (5 diffs)

cpp/frams/_demos/simil_test.cpp

@@ -71 +71 @@
 
     // prepare output parameters from .gen file
-    vector<Geno *> *pvGenos = new vector<Geno *>();
-    vector<char *> *pvNames = new vector<char *>();
+    vector<Geno *> pvGenos = vector<Geno *>();
+    vector<char *> pvNames = vector<char *>();
 
     // check if there is a switch
@@ -138 +138 @@
         if ((pNextGenotype != NULL) && (pNextGenotype->isValid()))
         {
-            pvGenos->push_back(pNextGenotype);
+            pvGenos.push_back(pNextGenotype);
             char *szNewName = new char [ loaded->name.len() + 1];
             strcpy(szNewName, loaded->name.c_str());
-            pvNames->push_back(szNewName);
+            pvNames.push_back(szNewName);
         }
         else
@@ -157 +157 @@
 
     // create the empty array of similarities
-    aaSimil = new pDouble [pvGenos->size()];
-    for (unsigned int k = 0; k < pvGenos->size(); k++)
-    {
-        aaSimil[k] = new double [pvGenos->size()];
-                for (unsigned int l = 0; l < pvGenos->size(); l++)
+    aaSimil = new pDouble [pvGenos.size()];
+    for (unsigned int k = 0; k < pvGenos.size(); k++)
+    {
+        aaSimil[k] = new double [pvGenos.size()];
+                for (unsigned int l = 0; l < pvGenos.size(); l++)
             aaSimil[k][l] = 0.0;
     }
 
     // compute and remember similarities
-        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));
+        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));
             aaSimil[i][j] = dSimilarity;
         }
@@ -179 +179 @@
         // if "-names" switch was given,
         // print the number of genotypes and their names
-        printf("%li\n", pvGenos->size());
-                for (unsigned int iGen = 0; iGen < pvNames->size(); iGen++)
-        {
-            printf("%s\n", pvNames->at(iGen));
+        printf("%li\n", pvGenos.size());
+                for (unsigned int iGen = 0; iGen < pvNames.size(); iGen++)
+        {
+            printf("%s\n", pvNames.at(iGen));
         }
     }
 
     // print out the matrix of similarities
-        for (unsigned int i = 0; i < pvGenos->size(); i++)
-    {
-                for (unsigned int j = 0; j < 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]);
@@ -197 +197 @@
 
     // delete vectors and arrays
-        for (unsigned int i = 0; i < pvGenos->size(); i++)
-    {
-        delete pvGenos->operator[](i);
-        delete [] pvNames->operator[](i);
+        for (unsigned int i = 0; i < pvGenos.size(); i++)
+    {
+        delete pvGenos.operator[](i);
+        delete [] pvNames.operator[](i);
         delete [] aaSimil[i];
     }
 
-    delete pvGenos;
-    delete pvNames;
     delete [] aaSimil;