Changeset f07fec in git for IntegerProgramming/matrix.cc

Timestamp:

Feb 4, 2014, 12:54:15 AM (10 years ago)

Author:

Max Horn <max@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9bc6bcbce12e05ef128c69bb444e6d03f1fd2ff0

Parents:

994c3dc99d02ae0db55a193692a2e41b6a562bcd

Message:

Silence compiler warnings about ambiguous looking 'else'

File:

• IntegerProgramming/matrix.cc (modified) (6 diffs)

IntegerProgramming/matrix.cc

@@ -351 +351 @@
   for(int i=0;i<_kernel_dimension;i++)
     if(M[i]>BigInt(0))
+    {
       if(min_index==-1)
         min_index=i;
-      else
-        if(M[i]<M[min_index])
-          min_index=i;
+      else if(M[i]<M[min_index])
+        min_index=i;
+    }
 
   // Now, H[min_index] is the vector to be transformed into a nonnegative one.
@@ -445 +446 @@
     for(int i=current_position;i<_kernel_dimension;i++)
       if(M[i]>BigInt(0))
+      {
         if(min_index==0)
           min_index=i;
-        else
-          if(M[i]<M[min_index])
-            min_index=i;
+        else if(M[i]<M[min_index])
+          min_index=i;
+      }
 
     // Now, a multiple of H[min_index] will be added to the already constructed
@@ -639 +641 @@
       for(int j=0;j<columns;j++)
         if(ideal_saturated_by_var[j]==FALSE)
+        {
           if(H[k][j]> BigInt(0))
             // ideal has to be saturated by the variables corresponding
@@ -647 +650 @@
             number_of_sat_var++;
           }
-          else
-            if(H[k][j]< BigInt(0))
+          else if(H[k][j]< BigInt(0))
               // then the ideal is automatically saturated by the variables
               // corresponding to negative components
               ideal_saturated_by_var[j]=TRUE;
+        }
     }
     else
@@ -657 +660 @@
       for(int j=0;j<columns;j++)
         if(ideal_saturated_by_var[j]==FALSE)
+        {
           if(H[k][j]< BigInt(0))
             // ideal has to be saturated by the variables corresponding
@@ -665 +669 @@
             number_of_sat_var++;
           }
-          else
-            if(H[k][j]> BigInt(0))
+          else if(H[k][j]> BigInt(0))
               // then the ideal is automatically saturated by the variables
               // corresponding to positive components
               ideal_saturated_by_var[j]=TRUE;
+        }
     }
   }