Changeset 08e15e7 in git for numeric/mpr_base.cc

Timestamp:

Sep 6, 2011, 7:40:16 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

213d649793d02bccc46292a68beead7b202af509

Parents:

b9cf410a96c73af3a43f5d317b0ff37eec0a49de

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-06 19:40:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:32+01:00

Message:

FIX: numeric/mpr_*

File:

• numeric/mpr_base.cc (modified) (29 diffs)

numeric/mpr_base.cc

@@ -9 +9 @@
  */
 
-#include <math.h>
-
+//-> includes
 #include <kernel/mod2.h>
 
+#include <misc/auxiliary.h>
+#include <omalloc/omalloc.h>
+
 #include <misc/mylimits.h>
-#include <omalloc/omalloc.h>
-
-//-> includes
-#include <kernel/options.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+
+#include <coeffs/numbers.h>
+#include <coeffs/mpr_global.h>
+
+#include <polys/matpol.h>
+#include <polys/sparsmat.h>
+
+#ifdef HAVE_FACTORY
+#include <polys/clapsing.h>
+#endif
+
+#include <kernel/febase.h>
 #include <kernel/polys.h>
 #include <kernel/ideals.h>
-#include <kernel/febase.h>
-#include <kernel/intvec.h>
-#include <kernel/matpol.h>
-#include <kernel/numbers.h>
-#ifdef HAVE_FACTORY
-#include <kernel/clapsing.h>
-#endif
-#include <kernel/sparsmat.h>
-
-#include <kernel/mpr_global.h>
-#include <kernel/mpr_base.h>
-#include <kernel/mpr_numeric.h>
+
+#include "mpr_base.h"
+#include "mpr_numeric.h"
+
+#include <math.h>
 //<-
 
@@ -278 +283 @@
 {
 public:
-  mayanPyramidAlg( simplex * _pLP ) : n(pVariables), pLP(_pLP) {}
+  mayanPyramidAlg( simplex * _pLP ) : n((currRing->N)), pLP(_pLP) {}
   ~mayanPyramidAlg() {}
 
@@ -380 +385 @@
       && (!nIsZero(pGetCoeff( MATELEM( omat, i, j)))))
       {
-        val= n_Int(pGetCoeff( MATELEM( omat, i, j) ), currRing);
+        val= n_Int(pGetCoeff( MATELEM( omat, i, j) ), currRing->cf);
         if ( i==MATROWS(omat) && j==MATCOLS(omat) )
         {
@@ -781 +786 @@
   int * vert;
 
-  n= pVariables;
+  n= (currRing->N);
   vert= (int *)omAlloc( (idelem+1) * sizeof(int) );
 
   Q = (pointSet **)omAlloc( idelem * sizeof(pointSet*) );        // support hulls
   for ( i= 0; i < idelem; i++ )
-    Q[i] = new pointSet( pVariables, i+1, pLength((gls->m)[i])+1 );
+    Q[i] = new pointSet( (currRing->N), i+1, pLength((gls->m)[i])+1 );
 
   for( i= 0; i < idelem; i++ )
@@ -820 +825 @@
     for ( j=1; j <= Q[i]->num; j++ )
     {
-      Print("%d: <",j);print_exp( (*Q[i])[j] , pVariables );PrintS(">\n");
+      Print("%d: <",j);print_exp( (*Q[i])[j] , (currRing->N) );PrintS(">\n");
     }
     PrintLn();
@@ -841 +846 @@
   int * vert;
 
-  n= pVariables;
+  n= (currRing->N);
   vert= (int *)omAlloc( (idelem+1) * sizeof(int) );
   id= idInit( idelem, 1 );
@@ -1218 +1223 @@
 bool resMatrixSparse::remapXiToPoint( const int indx, pointSet **pQ, int *set, int *pnt )
 {
-  int i,nn= pVariables;
+  int i,nn= (currRing->N);
   int loffset= 0;
   for ( i= 0; i <= nn; i++ )
@@ -1421 +1426 @@
 
   epp_mon= (int *)omAlloc( (n+2) * sizeof(int) );
-  eexp= (int *)omAlloc0((pVariables+1)*sizeof(int));
+  eexp= (int *)omAlloc0(((currRing->N)+1)*sizeof(int));
 
   totDeg= numSet0;
@@ -1480 +1485 @@
   pDelete( &epp );
   omFreeSize( (void *) epp_mon, (n+2) * sizeof(int) );
-  omFreeSize( (void *) eexp, (pVariables+1)*sizeof(int));
+  omFreeSize( (void *) eexp, ((currRing->N)+1)*sizeof(int));
 
 #ifdef mprDEBUG_ALL
@@ -1525 +1530 @@
   int j,k,l;
 
-  vert.point=(Coord_t*)omAlloc( (pVariables+2) * sizeof(Coord_t) );
+  vert.point=(Coord_t*)omAlloc( ((currRing->N)+2) * sizeof(Coord_t) );
 
   vs= new pointSet( dim );
@@ -1542 +1547 @@
   }
 
-  omFreeSize( (void *) vert.point, (pVariables+2) * sizeof(Coord_t) );
+  omFreeSize( (void *) vert.point, ((currRing->N)+2) * sizeof(Coord_t) );
 
   return vs;
@@ -1579 +1584 @@
   mprfloat shift[MAXVARS+2];   // shiftvector delta, index [1..dim]
 
-  if ( pVariables > MAXVARS )
+  if ( (currRing->N) > MAXVARS )
   {
     WerrorS("resMatrixSparse::resMatrixSparse: Too many variables!");
@@ -1593 +1598 @@
   istate= resMatrixBase::ready;
 
-  n= pVariables;
+  n= (currRing->N);
   idelem= IDELEMS(gls);  // should be n+1
 
@@ -1974 +1979 @@
 
   /** Recursively generate all homogeneous monoms of
-   * pVariables variables of degree deg.
+   * (currRing->N) variables of degree deg.
    */
   void generateMonoms( poly m, int var, int deg );
@@ -2029 +2034 @@
 
   /** holds the index of u0, u1, ..., un, if (elementOfS == linPolyS)
-   *  the size is given by pVariables
+   *  the size is given by (currRing->N)
    */
   int *numColParNr;
@@ -2100 +2105 @@
                 numVectors * sizeof( number ) );
     omfreeSize( (void *)resVectorList[i].numColParNr,
-                (pVariables+1) * sizeof(int) );
+                ((currRing->N)+1) * sizeof(int) );
   }
 
@@ -2135 +2140 @@
     {
       mprSTICKYPROT(ST_DENSE_FR);
-      for ( i= 0; i < pVariables; i++ )
+      for ( i= 0; i < (currRing->N); i++ )
       {
         MATELEM(m,numVectors-k,numVectors-(getMVector(k)->numColParNr)[i])= pInit();
@@ -2161 +2166 @@
     if ( linPolyS == getMVector(k)->elementOfS )
     {
-      for ( i=0; i < pVariables; i++ )
+      for ( i=0; i < (currRing->N); i++ )
       {
         Print(" %d ",(getMVector(k)->numColParNr)[i]);
@@ -2207 +2212 @@
   else
   {
-    if ( var == pVariables+1 ) return;
+    if ( var == (currRing->N)+1 ) return;
     poly newm = pCopy( mm );
     while ( deg >= 0 )
@@ -2352 +2357 @@
   // the internal Variable Ordering
   // make sure that the homogenization variable goes last!
-  intvec iVO( pVariables );
+  intvec iVO( (currRing->N) );
   if ( linPolyS != SNONE )
   {
-    iVO[pVariables - 1]= linPolyS;
+    iVO[(currRing->N) - 1]= linPolyS;
     int p=0;
-    for ( k= pVariables - 1; k >= 0; k-- )
+    for ( k= (currRing->N) - 1; k >= 0; k-- )
     {
       if ( k != linPolyS )
@@ -2369 +2374 @@
   {
     linPolyS= 0;
-    for ( k= 0; k < pVariables; k++ )
-      iVO[k]= pVariables - k - 1;
+    for ( k= 0; k < (currRing->N); k++ )
+      iVO[k]= (currRing->N) - k - 1;
   }
 
@@ -2425 +2430 @@
       resVectorList[k].numColVectorSize= 0;
       resVectorList[k].numColVector= NULL;
-      resVectorList[k].numColParNr= (int *)omAlloc0( (pVariables+1) * sizeof(int) );
+      resVectorList[k].numColParNr= (int *)omAlloc0( ((currRing->N)+1) * sizeof(int) );
 
       pi= (gls->m)[ resVectorList[k].elementOfS ];
@@ -2489 +2494 @@
     if ( resVectorList[i].elementOfS == linPolyS )
     {
-      for (j=1; j <= pVariables; j++ )
+      for (j=1; j <= (currRing->N); j++ )
       {
         if ( MATELEM(resmat,numVectors-i,
@@ -2498 +2503 @@
         if ( FALSE )
         {
-          pSetCoeff( MATELEM(resmat,numVectors-i,numVectors-resVectorList[i].numColParNr[j-1]), nPar(j) );
+          pSetCoeff( MATELEM(resmat,numVectors-i,numVectors-resVectorList[i].numColParNr[j-1]), n_Param(j,currRing) );
         }
         else
@@ -2555 +2560 @@
     if ( linPolyS == getMVector(k)->elementOfS )
     {
-      for ( i= 0; i < pVariables; i++ )
+      for ( i= 0; i < (currRing->N); i++ )
       {
         pSetCoeff( MATELEM(m,numVectors-k,numVectors-(getMVector(k)->numColParNr)[i]),
@@ -2567 +2572 @@
   // evaluate determinant of matrix m using factory singclap_det
 #ifdef HAVE_FACTORY
-  poly res= singclap_det( m );
+  poly res= singclap_det( m, currRing );
 #else
   poly res= NULL;
@@ -2631 +2636 @@
 
 #ifdef HAVE_FACTORY
-  poly res= singclap_det( mat );
+  poly res= singclap_det( mat, currRing );
 #else
   poly res= NULL;
@@ -2753 +2758 @@
   poly actlp, rootlp= newlp;
 
-  for ( i= 1; i <= pVariables; i++ )
+  for ( i= 1; i <= (currRing->N); i++ )
   {
     actlp= newlp;
@@ -3201 +3206 @@
   ideal idr;
 
-  n= pVariables;
+  n= (currRing->N);
   idelem= IDELEMS(id);  // should be n+1