Changeset 455 for cpp/frams/model

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/model/similarity/SVD/matrix_tools.cpp (modified) (7 diffs)

cpp/frams/model/similarity/SVD/matrix_tools.cpp

@@ -15 +15 @@
 double *Create(int nSize)
 {
-        double *matrix = (double *)malloc(nSize * sizeof(double));
+        double *matrix = new double[nSize];
 
         for (int i = 0; i < nSize; i++)
@@ -40 +40 @@
 
         if (delSize != 0)
-                free(toDel);
+                delete[] toDel;
         return c;
 }
@@ -71 +71 @@
 
         if (delSize != 0)
-                free(toDel);
+                delete[] toDel;
 
         return m_Power;
@@ -170 +170 @@
                 B = Multiply(B, Z, nSize, nSize, nSize, B, nSize);
 
-                free(Ones);
-                free(Eye);
-                free(Z);
-                free(D);
+                delete[] Ones;
+                delete[] Eye;
+                delete[] Z;
+                delete[] D;
         }
 
@@ -186 +186 @@
         double *W = Transpose(Vt, nSize, nSize);
 
-        free(B);
-        free(Vt);
+        delete[] B;
+        delete[] Vt;
 
         for (int i = 0; i < nSize; i++)
@@ -202 +202 @@
         sqS = Power(S, nSize, nSize, 0.5, S, nSize);
         dCoordinates = Multiply(W, sqS, nSize, nSize, nSize, W, nSize);
-        free(sqS);
+        delete[] sqS;
 
         for (int i = 0; i < nSize; i++)
@@ -222 +222 @@
         }
 
-        free(Eigenvalues);
-        free(dCoordinates);
-}
+        delete[] Eigenvalues;
+        delete[] dCoordinates;
+}