Changeset 056f98 in git

Timestamp:

Apr 12, 2001, 4:34:22 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

97090ad53dca442139c9aae6aad469070d418aea

Parents:

937cbcd9541714ba32c2fe91312690e65edf6f2f

Message:

*hannes:new +memset


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

Location:

IntegerProgramming

Files:

• IP_algorithms.cc (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• matrix.cc (modified) (3 diffs)
• solve_IP.cc (modified) (1 diff)
• term_ordering.cc (modified) (1 diff)

IntegerProgramming/IP_algorithms.cc

@@ -2427 +2427 @@
   {
     cerr<<"ERROR: int solve(INPUT_FILE, INPUT_FILE):\n"
-      "cannot read from first input file, possibly not found"<<endl;
+      "cannot read from first input file "<< PROBLEM <<", possibly not found"<<endl;
     return 0;
   }
@@ -2434 +2434 @@
   {
     cerr<<"ERROR: int solve(INPUT_FILE, INPUT_FILE):\n"
-      "cannot read from second input file, possibly not found"<<endl;
+      "cannot read from second input file "<< GROEBNER <<", possibly not found"<<endl;
     return 0;
   }

IntegerProgramming/Makefile.in

@@ -20 +20 @@
 
 INSTALL         = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
+INSTALL_PROGRAM = @INSTALL_PROGRAM@  -s
 MKINSTALLDIRS   = ../mkinstalldirs
 
@@ -83 +83 @@
         $(OBJECTS1)
         $(CXX) $^ -o $@ $(LDFLAGS)
-        strip $(MAIN1)
 
 $(MAIN2): term_ordering.o binomial.o list.o BigInt.o LLL.o matrix.o \
@@ -90 +89 @@
         $(OBJECTS2)
         $(CXX)  $^ -o $@ $(LDFLAGS)
-        strip $(MAIN2)
 
 $(MAIN3): term_ordering.o binomial.o list.o BigInt.o LLL.o matrix.o \
@@ -97 +95 @@
         $(OBJECTS3)
         $(CXX)  $^ -o $@ $(LDFLAGS)
-        strip $(MAIN3)
 
 $(MAIN4): term_ordering.o binomial.o list.o BigInt.o LLL.o matrix.o \
@@ -104 +101 @@
         $(OBJECTS4)
         $(CXX)  $^ -o $@ $(LDFLAGS)
-        strip $(MAIN4)
 
 $(LLL): $(OBJECTS_LLL)
         $(CXX)  $^ -o $@ $(LDFLAGS)
-        strip $(LLL)
 
 Makefile: Makefile.in 

IntegerProgramming/matrix.cc

@@ -552 +552 @@
     r=columns-r;
     F=new short[r];
+    memset(F,0,r*sizeof(short));
     short counter=0;
     for(short j=0;j<columns;j++)
@@ -565 +566 @@
   {
     F=new short[r];
+    memset(F,0,r*sizeof(short));
     short counter=0;
     for(short j=0;j<columns;j++)
@@ -608 +610 @@
   short number_of_sat_var=0;
   sat_var=new short[columns/2];
+  memset(sat_var,0,sizeof(short)*(columns/2));
 
   BOOLEAN* ideal_saturated_by_var=new BOOLEAN[columns];

IntegerProgramming/solve_IP.cc

@@ -249 +249 @@
 
       char* GROEBNER=new char[128];
+      memset(GROEBNER,0,128);
       short i=0;
-      while(argv[argc-2][i]!='\0' && argv[argc-2][i]!='.')
+      while(argv[argc-2][i]!='\0' && argv[argc-2][i]!='.' && argv[argc-2][i]>' ')
       {
         GROEBNER[i]=argv[argc-2][i];

IntegerProgramming/term_ordering.cc

@@ -257 +257 @@
 
       if(weight_vector[i]<0)
+      {
+        cout << "neg found at i="<<i<<":" <<weight_vector[i] <<"\n";
         negative_weight=TRUE;
+      } 
       if(weight_vector[i]==0)
         zero_weight=TRUE;