Changeset 1050 for cpp/frams/model/similarity/EMD

Timestamp:

12/11/20 21:40:59 (4 years ago)

Author:

Maciej Komosinski

Message:

Renamed variables that caused problems with g++ 7.3.0 - C99, 7.1.3 ("Reserved Identifiers"): All identifiers that begin with an underscore and either an uppercase letter or another underscore are always reserved for any use.

File:

• cpp/frams/model/similarity/EMD/emd.c (modified) (22 diffs)

cpp/frams/model/similarity/EMD/emd.c

@@ -54 +54 @@
 /* GLOBAL VARIABLE DECLARATION */
 static int _n1, _n2;                          /* SIGNATURES SIZES */
-static float _C[MAX_SIG_SIZE1][MAX_SIG_SIZE1];/* THE COST MATRIX */
-static node2_t _X[MAX_SIG_SIZE1*2];            /* THE BASIC VARIABLES VECTOR */
+static float _CM[MAX_SIG_SIZE1][MAX_SIG_SIZE1];/* THE COST MATRIX */
+static node2_t _XV[MAX_SIG_SIZE1*2];            /* THE BASIC VARIABLES VECTOR */
 /* VARIABLES TO HANDLE _X EFFICIENTLY */
 static node2_t *_EndX, *_EnterX;
@@ -146 +146 @@
   if (Flow != NULL)
     FlowP = Flow;
-  for(XP=_X; XP < _EndX; XP++)
+  for(XP=_XV; XP < _EndX; XP++)
     {
       if (XP == _EnterX)  /* _EnterX IS THE EMPTY SLOT */
@@ -156 +156 @@
         continue;
 
-      totalCost += (double)XP->val * _C[XP->i][XP->j];
+      totalCost += (double)XP->val * _CM[XP->i][XP->j];
       if (Flow != NULL)
         {
@@ -205 +205 @@
     for(j=0, P2=Signature2->Features; j < _n2; j++, P2++) 
       {
-        _C[i][j] = Dist(P1, P2);
-        if (_C[i][j] > _maxC)
-          _maxC = _C[i][j];
+        _CM[i][j] = Dist(P1, P2);
+        if (_CM[i][j] > _maxC)
+          _maxC = _CM[i][j];
       }
         
@@ -233 +233 @@
         {
           for (j=0; j < _n2; j++)
-            _C[_n1][j] = 0;
+            _CM[_n1][j] = 0;
           S[_n1] = -diff;
           _RowsX[_n1] = NULL;
@@ -241 +241 @@
         {
           for (i=0; i < _n1; i++)
-            _C[i][_n2] = 0;
+            _CM[i][_n2] = 0;
           D[_n2] = diff;
           _ColsX[_n2] = NULL;
@@ -252 +252 @@
     for (j=0; j < _n2; j++)
         _IsX[i][j] = 0;
-  _EndX = _X;
+  _EndX = _XV;
    
   _maxW = sSum > dSum ? sSum : dSum;
@@ -345 +345 @@
                     {
                       /* COMPUTE U[i] */
-                      CurU->val = _C[i][j] - CurV->val;
+                      CurU->val = _CM[i][j] - CurV->val;
                       /* ...AND ADD IT TO THE MARKED LIST */
                       PrevU->Next = CurU->Next;
@@ -375 +375 @@
                     {
                       /* COMPUTE V[j] */
-                      CurV->val = _C[i][j] - CurU->val;
+                      CurV->val = _CM[i][j] - CurU->val;
                       /* ...AND ADD IT TO THE MARKED LIST */
                       PrevV->Next = CurV->Next;
@@ -417 +417 @@
       if (! _IsX[i][j])
         {
-          delta = _C[i][j] - U[i].val - V[j].val;
+          delta = _CM[i][j] - U[i].val - V[j].val;
           if (deltaMin > delta)
             {
@@ -540 +540 @@
   CurX = Loop;
   NewX = *CurX = _EnterX;
-  IsUsed[_EnterX-_X] = 1;
+  IsUsed[_EnterX-_XV] = 1;
   steps = 1;
 
@@ -549 +549 @@
           /* FIND AN UNUSED X IN THE ROW */
           NewX = _RowsX[NewX->i];
-          while (NewX != NULL && IsUsed[NewX-_X])
+          while (NewX != NULL && IsUsed[NewX-_XV])
             NewX = NewX->NextC;
         }
@@ -556 +556 @@
           /* FIND AN UNUSED X IN THE COLUMN, OR THE ENTERING X */
           NewX = _ColsX[NewX->j];
-          while (NewX != NULL && IsUsed[NewX-_X] && NewX != _EnterX)
+          while (NewX != NULL && IsUsed[NewX-_XV] && NewX != _EnterX)
             NewX = NewX->NextR;
           if (NewX == _EnterX)
@@ -566 +566 @@
          /* ADD X TO THE LOOP */
          *++CurX = NewX;
-         IsUsed[NewX-_X] = 1;
+         IsUsed[NewX-_XV] = 1;
          steps++;
 #if DEBUG_LEVEL > 3
@@ -584 +584 @@
                  else
                    NewX = NewX->NextC;
-               } while (NewX != NULL && IsUsed[NewX-_X]);
+               } while (NewX != NULL && IsUsed[NewX-_XV]);
              
              if (NewX == NULL)
                {
-                 IsUsed[*CurX-_X] = 0;
+                 IsUsed[*CurX-_XV] = 0;
                  CurX--;
                  steps--;
@@ -598 +598 @@
                 steps, NewX->i, NewX->j);    
 #endif
-           IsUsed[*CurX-_X] = 0;
+           IsUsed[*CurX-_XV] = 0;
            *CurX = NewX;
-           IsUsed[NewX-_X] = 1;
+           IsUsed[NewX-_XV] = 1;
        }     
     } while(CurX >= Loop);
@@ -659 +659 @@
       {
         float v;
-        v = _C[i][j];
+        v = _CM[i][j];
         if (Ur[i].val <= v)
           Ur[i].val = v;
@@ -669 +669 @@
   for(i=0; i < _n1 ; i++)
     for(j=0; j < _n2 ; j++)
-      Delta[i][j] = _C[i][j] - Ur[i].val - Vr[j].val;
+      Delta[i][j] = _CM[i][j] - Ur[i].val - Vr[j].val;
 
   /* FIND THE BASIC VARIABLES */
@@ -727 +727 @@
               int j;
               j = CurV->i;
-              if (CurV->val == _C[minI][j])  /* COLUMN j NEEDS UPDATING */
+              if (CurV->val == _CM[minI][j])  /* COLUMN j NEEDS UPDATING */
                 {
                   /* FIND THE NEW MAXIMUM VALUE IN THE COLUMN */
@@ -736 +736 @@
                       int i;
                       i = CurU->i;
-                      if (CurV->val <= _C[i][j])
-                        CurV->val = _C[i][j];
+                      if (CurV->val <= _CM[i][j])
+                        CurV->val = _CM[i][j];
                     }
                   
@@ -754 +754 @@
               int i;
               i = CurU->i;
-              if (CurU->val == _C[i][minJ])  /* ROW i NEEDS UPDATING */
+              if (CurU->val == _CM[i][minJ])  /* ROW i NEEDS UPDATING */
                 {
                   /* FIND THE NEW MAXIMUM VALUE IN THE ROW */
@@ -763 +763 @@
                       int j;
                       j = CurV->i;
-                      if(CurU->val <= _C[i][j])
-                        CurU->val = _C[i][j];
+                      if(CurU->val <= _CM[i][j])
+                        CurU->val = _CM[i][j];
                     }