Changeset 1bbaa1 in git

Timestamp:

May 19, 2000, 3:05:54 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

60f2ab568299f910ca263722982843a8d9e49653

Parents:

754cf997b0bc052e7097b430776ff2a512e1dfa5

Message:

* unshadow i


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

File:

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

IntegerProgramming/IP_algorithms.cc

@@ -2252 +2252 @@
 
   float *hom_grad=new float[variables];
-
-  for(short i=0;i<variables;i++)
-  {
-    input>>hom_grad[i];
+  
+  for(short _i=0;_i<variables;_i++)
+  {
+    input>>hom_grad[_i];
 
     if(!input)
@@ -2267 +2267 @@
     }
 
-    if(hom_grad[i]<=0)
+    if(hom_grad[_i]<=0)
     {
       cerr<<"ERROR: int Bigatti_LaScala_Robbiano(INPUT_FILE, const BOOLEAN&):"
@@ -2276 +2276 @@
     }
   }
+  
 
 
@@ -3085 +3086 @@
     {
       // at the beginning, the variables of interest are zero
-      for(short i=0;i<weighted_variables;i++)
+      for(i=0;i<weighted_variables;i++)
         right_hand[i]=0;
 
       // right hand vector is read from the input stream into the
       // elimination variables
-      for(short i=weighted_variables;
+      for(i=weighted_variables;
           i<weighted_variables+elimination_variables-1;i++)
       {
@@ -3108 +3109 @@
       // - min{negative components of right_hand}.
       Integer min=0;
-      for(short i=weighted_variables;
+      for(i=weighted_variables;
           i<weighted_variables+elimination_variables-1;i++)
         if(right_hand[i]<min)
@@ -3115 +3116 @@
       // transform right_hand so that all components are nonnegative
       if(min<0)
-        for(short i=weighted_variables;
+        for(i=weighted_variables;
             i<weighted_variables+elimination_variables-1;i++)
           right_hand[i]-=min;
@@ -3139 +3140 @@
 
       output<<"right hand vector:"<<endl;
-      for(short i=weighted_variables;
+      for(i=weighted_variables;
           i<weighted_variables+elimination_variables-1;i++)
         output<<setw(6)<<right_hand[i]+min;
@@ -3148 +3149 @@
 
       BOOLEAN solvable=TRUE;
-      for(short i=weighted_variables;
+      for(i=weighted_variables;
           i<=weighted_variables+elimination_variables-1;i++)
         if(to_reduce[i]!=0)
@@ -3160 +3161 @@
         output<<"YES"<<endl;
         output<<"optimal solution:"<<endl;
-        for(short i=0;i<weighted_variables;i++)
+        for(i=0;i<weighted_variables;i++)
           output<<setw(6)<<to_reduce[i];
         output<<endl;
@@ -3192 +3193 @@
       {
         // at the beginning, the variables of interest are zero
-        for(short i=0;i<weighted_variables;i++)
+        for(i=0;i<weighted_variables;i++)
           right_hand[i]=0;
 
         // right hand vector is read from the input stream into the
         // elimination variables
-        for(short i=weighted_variables;
+        for(i=weighted_variables;
             i<weighted_variables+elimination_variables;i++)
         {
@@ -3246 +3247 @@
 
         output<<"right hand vector:"<<endl;
-        for(short i=weighted_variables;
+        for(i=weighted_variables;
             i<weighted_variables+elimination_variables;i++)
           output<<setw(6)<<right_hand[i];
@@ -3255 +3256 @@
 
         BOOLEAN solvable=TRUE;
-        for(short i=weighted_variables;
+        for(i=weighted_variables;
             i<weighted_variables+elimination_variables;i++)
           if(to_reduce[i]!=0)
@@ -3267 +3268 @@
           output<<"YES"<<endl;
           output<<"optimal solution:"<<endl;
-          for(short i=0;i<weighted_variables;i++)
+          for(i=0;i<weighted_variables;i++)
             output<<setw(6)<<to_reduce[i];
           output<<endl;
@@ -3298 +3299 @@
         // initial solution vector is read from the input stream into the
         // elimination variables
-        for(short i=0;i<weighted_variables;i++)
+        for(i=0;i<weighted_variables;i++)
         {
           problem>>initial_solution[i];
@@ -3333 +3334 @@
 
         output<<"initial solution vector:"<<endl;
-        for(short i=0;i<weighted_variables;i++)
+        for(i=0;i<weighted_variables;i++)
           output<<setw(6)<<initial_solution[i];
         // original vector
@@ -3339 +3340 @@
 
         output<<"optimal solution:"<<endl;
-        for(short i=0;i<weighted_variables;i++)
+        for(i=0;i<weighted_variables;i++)
           output<<setw(6)<<to_reduce[i];
         output<<endl;