Changeset 64a88e in git

Timestamp:

Aug 13, 2009, 5:31:27 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f5da374c614ef679bad9ff3b7d6e407d7f0dc8b0

Parents:

073295f83bd787c17170311fa837e22cf427905d

Message:

*hannes: remove unused parameter


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

Location:

kernel

Files:

• clapconv.cc (modified) (4 diffs)
• clapconv.h (modified) (2 diffs)
• clapsing.cc (modified) (20 diffs)
• longalg.cc (modified) (2 diffs)

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.15 2009-08-13 15:17:02 Singular Exp $
+// $Id: clapconv.cc,v 1.16 2009-08-13 15:31:27 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -162 +162 @@
 
 
-CanonicalForm convSingPFactoryP( poly p, const int off, const ring r )
+CanonicalForm convSingPFactoryP( poly p, const ring r )
 {
   CanonicalForm result = 0;
@@ -206 +206 @@
     {
       if ( (e = p_GetExp( p, i, r)) != 0 )
-        term *= power( Variable( i+off ), e );
+        term *= power( Variable( i ), e );
     }
     result += term;
@@ -409 +409 @@
   {
     n_Normalize(pGetCoeff(p),r);
-    CanonicalForm term=convSingPFactoryP(((lnumber)pGetCoeff(p))->z,0,r->algring);
+    CanonicalForm term=convSingPFactoryP(((lnumber)pGetCoeff(p))->z,r->algring);
 
     if ((((lnumber)pGetCoeff(p))->n!=NULL)

kernel/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.5 2009-08-13 15:17:02 Singular Exp $
+// $Id: clapconv.h,v 1.6 2009-08-13 15:31:27 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -17 +17 @@
 
 poly convFactoryPSingP ( const CanonicalForm & f, const ring r=currRing );
-CanonicalForm convSingPFactoryP( poly p, const int off=0, const ring r=currRing );
+CanonicalForm convSingPFactoryP( poly p, const ring r=currRing );
 
 CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a );

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.42 2009-08-13 15:17:02 Singular Exp $
+// $Id: clapsing.cc,v 1.43 2009-08-13 15:31:27 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -45 +45 @@
     CanonicalForm newGCD(const CanonicalForm & A, const CanonicalForm & B);
     setCharacteristic( n_GetChar(r) );
-    CanonicalForm F( convSingPFactoryP( f,0,r ) ), G( convSingPFactoryP( g,0, r ) );
+    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     //if (nGetChar() > 1 )
     //{
@@ -66 +66 @@
       {
       //  WerrorS( feNotImplemented );
-        CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,0,r->algring);
+        CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,r->algring);
         //Varlist ord;
         //ord.append(mipo.mvar());
@@ -83 +83 @@
         if ( nGetChar()==1 ) On(SW_USE_QGCD);
         CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
-                                           0,r->algring);
+                                           r->algring);
         Variable a=rootOf(mipo);
         CanonicalForm F( convSingAPFactoryAP( f,a ) ),
@@ -179 +179 @@
       //Variable X(i);
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 0,currRing->algring);
+                                                 currRing->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
@@ -321 +321 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 0,currRing->algring);
+                                                 currRing->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
@@ -371 +371 @@
   {
     setCharacteristic( n_GetChar(r) );
-    CanonicalForm F( convSingPFactoryP( f,0,r ) ), G( convSingPFactoryP( g,0,r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r) );
     CanonicalForm FpG=F+G;
     if (!(FpG.isUnivariate()|| FpG.inCoeffDomain()))
@@ -397 +397 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
-                                            0,r->algring);
+                                            r->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) ),
@@ -459 +459 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                                 0,currRing->algring);
+                                                 currRing->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) ), G( convSingAPFactoryAP( g,a ) );
@@ -546 +546 @@
       pIter(p);
     }
-    g = convSingPFactoryP( ((lnumber)g1)->z, 0,currRing->algring );
-    g = gcd( g, convSingPFactoryP( ((lnumber)g2)->z , 0,currRing->algring));
+    g = convSingPFactoryP( ((lnumber)g1)->z, currRing->algring );
+    g = gcd( g, convSingPFactoryP( ((lnumber)g2)->z , currRing->algring));
 
     // second run: gcd's
@@ -554 +554 @@
     while ( (p != NULL) && (g != 1)  && ( g != 0))
     {
-      h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, 0,currRing->algring );
+      h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, currRing->algring );
       pIter( p );
 
@@ -621 +621 @@
       {
         CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                    0,currRing->algring);
+                                    currRing->algring);
         a=rootOf(mipo);
         F=convSingAPFactoryAP( f,a );
@@ -845 +845 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                   0,currRing->algring);
+                   currRing->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) );
@@ -1190 +1190 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                    0,currRing->algring);
+                    currRing->algring);
       Variable a=rootOf(mipo);
       CanonicalForm F( convSingAPFactoryAP( f,a ) );
@@ -1444 +1444 @@
     //{
     //  CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-    //                                             0,currRing->algring);
+    //                                             currRing->algring);
     //  Variable a=rootOf(mipo);
     //  CanonicalForm F( convSingAPFactoryAP( f,a ) );
@@ -1499 +1499 @@
     {
       CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                            0,currRing->algring);
+                                            currRing->algring);
       Variable a=rootOf(mipo);
       int i,j;
@@ -1557 +1557 @@
  {
    CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                                         0,currRing->algring);
+                                         currRing->algring);
    Variable a=rootOf(mipo);
    CanonicalForm F( convSingAFactoryA( f,a ) ), G( convSingAFactoryA( g,a ) );
@@ -1570 +1570 @@
  else
  {
-   CanonicalForm F( convSingPFactoryP( f,0,currRing->algring ) ),
-                 G( convSingPFactoryP( g,0,currRing->algring ) );
+   CanonicalForm F( convSingPFactoryP( f,currRing->algring ) ),
+                 G( convSingPFactoryP( g,currRing->algring ) );
    CanonicalForm GCD;
    // calculate gcd
@@ -1595 +1595 @@
  {
    CanonicalForm mipo=convSingPFactoryP(((lnumber)currRing->minpoly)->z,
-                         0,currRing->algring);
+                         currRing->algring);
    Variable a=rootOf(mipo);
    CanonicalForm F( convSingAFactoryA( f,a ) ), G( convSingAFactoryA( g,a ) );
@@ -1610 +1610 @@
  else
  {
-   CanonicalForm F( convSingPFactoryP( f,0,currRing->algring ) ),
-                 G( convSingPFactoryP( g,0,currRing->algring ) );
+   CanonicalForm F( convSingPFactoryP( f,currRing->algring ) ),
+                 G( convSingPFactoryP( g,currRing->algring ) );
    CanonicalForm GCD;
 

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.45 2009-08-13 15:17:03 Singular Exp $ */
+/* $Id: longalg.cc,v 1.46 2009-08-13 15:31:27 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -1530 +1530 @@
     napoly rz=napGcd(x->z, y->z);
     CanonicalForm F, G, R;
-    R=convSingPFactoryP(rz,0,nacRing);
+    R=convSingPFactoryP(rz,nacRing);
     p_Normalize(x->z,nacRing);
-    F=convSingPFactoryP(x->z,0,nacRing)/R;
+    F=convSingPFactoryP(x->z,nacRing)/R;
     p_Normalize(y->z,nacRing);
-    G=convSingPFactoryP(y->z,0,nacRing)/R;
+    G=convSingPFactoryP(y->z,nacRing)/R;
     F = gcd( F, G );
     if (F.isOne())