Changeset d96b79 in git for IntegerProgramming/matrix.cc

Timestamp:

Apr 14, 2003, 10:16:22 AM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

42c03ae4b5550eede82d007996fbc1809c919081

Parents:

a7c8b18aaee6ef15b1855f3bbd8d65f0c06f27b6

Message:

* Stefan Wolf (wolfs@in.tum.de): gcc 3.2.2 port


git-svn-id: file:///usr/local/Singular/svn/trunk@6670 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

IntegerProgramming/matrix.cc

@@ -320 +320 @@
     M[i]=0;
     for(short j=0;j<columns;j++)
-      if(H[i][j]==0)
+      if(H[i][j]==(const BigInt&)0)
         M[i]++;
   }
@@ -348 +348 @@
   short min_index=-1;
   for(short i=0;i<_kernel_dimension;i++)
-    if(M[i]>0)
+    if(M[i]>(const BigInt&)0)
       if(min_index==-1)
         min_index=i;
@@ -385 +385 @@
     BOOLEAN found=TRUE;
     for(short j=0;j<columns;j++)
-      if(H[0][j]==0)
+      if(H[0][j]==(const BigInt&)0)
         found=FALSE;
 
@@ -405 +405 @@
 
     for(short j=0;j<columns;j++)
-      if(H[0][j]==0)
+      if(H[0][j]==(const BigInt&)0)
       {
         remaining_zero_components++;
         for(short i=current_position;i<_kernel_dimension;i++)
-          if(H[i][j]==0)
+          if(H[i][j]==(const BigInt&)0)
             M[i]++;
       }
@@ -421 +421 @@
         min=M[i];
 
-    if(min==remaining_zero_components)
+    if(min==(const BigInt&)remaining_zero_components)
       // all zero components in H[0] are zero in each remaining vector
       // => desired vector does not exist
@@ -442 +442 @@
     short min_index=0;
     for(short i=current_position;i<_kernel_dimension;i++)
-      if(M[i]>0)
+      if(M[i]>(const BigInt&)0)
         if(min_index==0)
           min_index=i;
@@ -477 +477 @@
       // mult*H[current_position]
       for(short j=0;j<columns;j++)
-        if(H[0][j]!=0)
-          if(H[0][j]+mult*H[current_position][j]==0)
+        if(H[0][j]!=(const BigInt&)0)
+          if(H[0][j]+(const BigInt&)mult*H[current_position][j]
+            ==(const BigInt&)0)
             found=FALSE;
 
       if(found==TRUE)
         for(short j=0;j<columns;j++)
-          H[0][j]+=mult*H[current_position][j];
-
+          H[0][j]+=(const BigInt&)mult*H[current_position][j];
       else
         // try -mult
@@ -494 +494 @@
         // mult*H[current_position]
         for(short j=0;j<columns;j++)
-          if(H[0][j]!=0)
-            if(H[0][j]-mult*H[current_position][j]==0)
+          if(H[0][j]!=(const BigInt&)0)
+            if(H[0][j]-(const BigInt&)mult*H[current_position][j]
+              ==(const BigInt&)0)
               found=FALSE;
 
         if(found==TRUE)
           for(short j=0;j<columns;j++)
-            H[0][j]-=mult*H[current_position][j];
+            H[0][j]-=(const BigInt&)mult*H[current_position][j];
       }
-
     }
-
-  }
-
+  }
 
 // When reaching this line, an error must have occurred.
   cerr<<"FATAL ERROR in short matrix::compute_nonnegative_vector()"<<endl;
   abort();
-
-}
-
-
-
+}
 
 short matrix::compute_flip_variables(short*& F)
@@ -538 +532 @@
 
   for(short j=0;j<columns;j++)
-    if(H[0][j]<0)
+    if(H[0][j]<(const BigInt&)0)
       r++;
   // remember that all components of H[0] are !=0
@@ -555 +549 @@
     short counter=0;
     for(short j=0;j<columns;j++)
-      if(H[0][j]>0)
+      if(H[0][j]>(const BigInt&)0)
       {
         F[counter]=j;
@@ -569 +563 @@
     short counter=0;
     for(short j=0;j<columns;j++)
-      if(H[0][j]<0)
+      if(H[0][j]<(const BigInt&)0)
       {
         F[counter]=j;
@@ -629 +623 @@
       if(ideal_saturated_by_var[j]==FALSE)
       {
-        if(H[k][j]>0)
+        if(H[k][j]>(const BigInt&)0)
           pos_sat_var++;
         else
-          if(H[k][j]<0)
+          if(H[k][j]<(const BigInt&)0)
             neg_sat_var++;
       }
@@ -643 +637 @@
       for(short j=0;j<columns;j++)
         if(ideal_saturated_by_var[j]==FALSE)
-          if(H[k][j]>0)
+          if(H[k][j]>(const BigInt&)0)
             // ideal has to be saturated by the variables corresponding
             // to positive components
@@ -652 +646 @@
           }
           else
-            if(H[k][j]<0)
+            if(H[k][j]<(const BigInt&)0)
               // then the ideal is automatically saturated by the variables
               // corresponding to negative components
@@ -661 +655 @@
       for(short j=0;j<columns;j++)
         if(ideal_saturated_by_var[j]==FALSE)
-          if(H[k][j]<0)
+          if(H[k][j]<(const BigInt&)0)
             // ideal has to be saturated by the variables corresponding
             // to negative components
@@ -670 +664 @@
           }
           else
-            if(H[k][j]>0)
+            if(H[k][j]>(const BigInt&)0)
               // then the ideal is automatically saturated by the variables
               // corresponding to positive components