Changeset 36f8d9 in git for IntegerProgramming

Timestamp:

Aug 11, 2004, 3:32:25 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e65fe97407c42bd793157749a8b4dc89f2599006

Parents:

f691ff55cda7f85c9d30797234f6e91f3a44b01a

Message:

*hannes: gcc3.4 changes from Ralf Stephan <ralf@ark.in-berlin.de>


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

Location:

IntegerProgramming

Files:

• LLL.cc (modified) (6 diffs)
• LLL_lattice_to_send.cc (modified) (2 diffs)
• matrix.cc (modified) (8 diffs)

IntegerProgramming/LLL.cc

@@ -202 +202 @@
 }
 
-
+typedef BigInt* BigIntP;
 
 
@@ -241 +241 @@
     if(r==1)
     {
-      H=new (BigInt*)[1];
+      H=new BigIntP[1];
       H[0]=new BigInt[1];
       H[0][0]=1;
@@ -260 +260 @@
 // number_of_vectors+1.
 
-  H=new (BigInt*)[number_of_vectors];
+  H=new BigIntP[number_of_vectors];
   for(short n=0;n<number_of_vectors;n++)
     H[n]=new BigInt[number_of_vectors];
@@ -268 +268 @@
   BigInt* d=new BigInt[number_of_vectors+1];
 
-  BigInt** lambda=new (BigInt*)[number_of_vectors];
+  BigInt** lambda=new BigIntP[number_of_vectors];
   for(short n=1;n<number_of_vectors;n++)
     lambda[n]=new BigInt[n];
@@ -411 +411 @@
   BigInt **aux=H;
   if(r>0)
-    H=new (BigInt*)[r];
+    H=new BigIntP[r];
   for(short i=0;i<r;i++)
     H[i]=aux[i];
@@ -475 +475 @@
   BigInt* d=new BigInt[number_of_vectors+1];
 
-  BigInt** lambda=new (BigInt*)[number_of_vectors];
+  BigInt** lambda=new BigIntP[number_of_vectors];
   for(short s=1;s<number_of_vectors;s++)
     lambda[s]=new BigInt[s];

IntegerProgramming/LLL_lattice_to_send.cc

@@ -91 +91 @@
 
   lll_d = new mpz_t[F + 1];
-  lll_lambda = new (mpz_t *)[F + 1];
+  lll_lambda = new mpz_t *[F + 1];
   mpz_init (lll_d[0]);
   for (i = 1; i <= F; i++) {
@@ -194 +194 @@
   aux=new char[tamano];
   fscanf (stdin, "%i, %i\n", &numF, &numC);
-  base = new (mpz_t *)[numF+1];
+  base = new mpz_t *[numF+1];
   for (i = 1; i <= numF; i++) {
     base[i] = new mpz_t[numC+1];

IntegerProgramming/matrix.cc

@@ -9 +9 @@
 
 ////////////// constructors and destructor //////////////////////////////////
+typedef Integer* IntegerP;
+typedef BigInt* BigIntP;
 
 matrix::matrix(const short& row_number, const short& column_number)
@@ -28 +30 @@
   // memory allocation and initialization
 
-  coefficients=new (Integer*)[rows];
+  coefficients=new IntegerP[rows];
   for(short i=0;i<rows;i++)
     coefficients[i]=new Integer[columns];
@@ -55 +57 @@
   // memory allocation and initialization
 
-  coefficients=new (Integer*)[rows];
+  coefficients=new IntegerP[rows];
   for(short i=0;i<rows;i++)
     coefficients[i]=new Integer[columns];
@@ -98 +100 @@
   }
 
-  coefficients=new (Integer*)[rows];
+  coefficients=new IntegerP[rows];
   for(short i=0;i<rows;i++)
     coefficients[i]=new Integer[columns];
@@ -138 +140 @@
   // memory allocation and initialization
 
-  coefficients=new (Integer*)[rows];
+  coefficients=new IntegerP[rows];
   for(short i=0;i<rows;i++)
     coefficients[i]=new Integer[columns];
@@ -170 +172 @@
   // memory allocation and initialization (also for H)
 
-  coefficients=new (Integer*)[rows];
+  coefficients=new IntegerP[rows];
   for(short i=0;i<rows;i++)
     coefficients[i]=new Integer[columns];
@@ -179 +181 @@
   if(_kernel_dimension>0)
   {
-    H=new (BigInt*)[_kernel_dimension];
+    H=new BigIntP[_kernel_dimension];
     for(short k=0;k<_kernel_dimension;k++)
       H[k]=new (BigInt)[columns];
@@ -260 +262 @@
   // copy the column vectors of the actual matrix
   // (They are modified by the LLL-algorithm!)
-  BigInt** b=new (BigInt*)[columns];
+  BigInt** b=new BigIntP[columns];
   for(short n=0;n<columns;n++)
     b[n]=new BigInt[rows];