Changeset 194c2e7 in git for IntegerProgramming/ideal_stuff.cc

Timestamp:

Feb 9, 2010, 6:50:36 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6c939eebfd221f2512b1e27d158d1b5457206987

Parents:

a477f80136c773f8acffd73512f53bf88a7c6fe8

Message:

short -> int

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

File:

• IntegerProgramming/ideal_stuff.cc (modified) (10 diffs)

IntegerProgramming/ideal_stuff.cc

@@ -65 +65 @@
 
   // elimination
-  for(short i=0;i<Number_of_Lists;i++)
+  for(int i=0;i<Number_of_Lists;i++)
   {
     iter.set_to_list(generators[i]);
@@ -125 +125 @@
   list_iterator iter;
 
-  short last_weighted_variable=w.number_of_weighted_variables()-1;
+  int last_weighted_variable=w.number_of_weighted_variables()-1;
 
 
@@ -167 +167 @@
 // For the time needed by this function see the remarks for ideal::eliminate().
 
-  for(short i=0;i<Number_of_Lists;i++)
+  for(int i=0;i<Number_of_Lists;i++)
   {
     iter.set_to_list(generators[i]);
@@ -260 +260 @@
 // the aux_list and then reinserted according to their new head.
 
-  for(short i=0;i<Number_of_Lists;i++)
+  for(int i=0;i<Number_of_Lists;i++)
   {
     iter.set_to_list(generators[i]);
@@ -314 +314 @@
 
 
-ideal& ideal::swap_variables_unsafe(const short& i, const short& j)
+ideal& ideal::swap_variables_unsafe(const int& i, const int& j)
 {
   // first check arguments
@@ -320 +320 @@
      || (j<0) || (j>=w.number_of_weighted_variables()))
   {
-    cout<<"WARNING: ideal::swap_variables(const short&, const short&)\n "
-      "or ideal::swap_variables_unsafe(const short&, const short&):\n"
+    cout<<"WARNING: ideal::swap_variables(const int&, const int&)\n "
+      "or ideal::swap_variables_unsafe(const int&, const int&):\n"
       "index out of range"<<endl;
     return *this;
@@ -353 +353 @@
 // But head and tail are not adapted to the new term ordering induced by
 // the change of the variable order - this is only done in the "safe"
-// routine swap_variables(const short&, const short&).
-
-  for(short l=0;l<Number_of_Lists;l++)
+// routine swap_variables(const int&, const int&).
+
+  for(int l=0;l<Number_of_Lists;l++)
   {
     iter.set_to_list(generators[l]);
@@ -393 +393 @@
 
 
-ideal& ideal::swap_variables(const short& i, const short& j)
+ideal& ideal::swap_variables(const int& i, const int& j)
 {
 
@@ -407 +407 @@
 
 
-ideal& ideal::flip_variable_unsafe(const short& i)
+ideal& ideal::flip_variable_unsafe(const int& i)
 {
   // first check argument
   if((i<0) || (i>=w.number_of_weighted_variables()))
   {
-    cout<<"WARNING: ideal::flip_variables(const short&):\n"
+    cout<<"WARNING: ideal::flip_variables(const int&):\n"
       "argument out of range, nothing done"<<endl;
     return *this;
@@ -439 +439 @@
 // to the aux_list and then reinserted according to their new head.
 
-  for(short l=0;l<Number_of_Lists;l++)
+  for(int l=0;l<Number_of_Lists;l++)
   {
     iter.set_to_list(generators[l]);