Changeset aaf310 in git

Timestamp:

Oct 16, 2009, 12:29:28 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d1f231e3b792657bbd71d87ddd26f304449bd4f4

Parents:

6666eaa6f8a2ff004dc43a60643801895ec2db11

Message:

*hannes: more ring args


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

Location:

kernel

Files:

• clapconv.cc (modified) (9 diffs)
• clapconv.h (modified) (3 diffs)

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.20 2009-10-08 10:43:33 Singular Exp $
+// $Id: clapconv.cc,v 1.21 2009-10-16 10:29:28 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -35 +35 @@
 static void convRecGFGF ( const CanonicalForm & f, int * exp, poly & result );
 
-static number convFactoryNSingAN( const CanonicalForm &f);
+static number convFactoryNSingAN( const CanonicalForm &f, const ring r);
 
 CanonicalForm convSingNFactoryN( number n, const ring r )
@@ -236 +236 @@
 
 static void
-convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start) ;
-
-poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start )
-{
-  int n = pVariables+1+rPar(currRing);
+convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start, const ring r) ;
+
+poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start, const ring r )
+{
+  int n = rVar(r)+rPar(r)+1;
   int * exp = (int *)omAlloc0(n*sizeof(int));
   poly result = NULL;
-  convRecAP_R( f, exp, result,par_start, var_start );
+  convRecAP_R( f, exp, result,par_start, var_start, r );
   omFreeSize((ADDRESS)exp,n*sizeof(int));
   return result;
 }
 
-poly convFactoryAPSingAP ( const CanonicalForm & f )
-{
-  return convFactoryAPSingAP_R(f,0,rPar(currRing));
-}
-
-static void convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start )
+poly convFactoryAPSingAP ( const CanonicalForm & f, const ring r )
+{
+  return convFactoryAPSingAP_R(f,0,rPar(r),r);
+}
+
+static void convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start, const ring r )
 {
   if (f.isZero())
@@ -263 +263 @@
     {
       exp[l] = i.exp();
-      convRecAP_R( i.coeff(), exp, result, par_start, var_start );
+      convRecAP_R( i.coeff(), exp, result, par_start, var_start, r);
     }
     exp[l] = 0;
@@ -269 +269 @@
   else
   {
-    napoly z=(napoly)convFactoryASingA( f );
+    napoly z=(napoly)convFactoryASingA( f,r );
     if (z!=NULL)
     {
-      poly term = pInit();
+      poly term = p_Init(r);
       pNext( term ) = NULL;
       int i;
-      for ( i = 1; i <= pVariables; i++ )
-        pSetExp( term, i , exp[i+var_start]);
+      for ( i = rVar(r); i>0 ; i-- )
+        p_SetExp( term, i , exp[i+var_start],r);
       //if (rRing_has_Comp(currRing->algring)) p_SetComp(term, 0, currRing->algring); // done by pInit
       if (par_start==0)
@@ -282 +282 @@
         for ( i = 1; i <= var_start; i++ )
         //z->e[i-1]+=exp[i];
-          napAddExp(z,i,exp[i]);
+          p_AddExp(z,i,exp[i],r->algring);
       }
       else
@@ -288 +288 @@
         for ( i = par_start+1; i <= var_start+rPar(currRing); i++ )
         //z->e[i-1]+=exp[i];
-          napAddExp(z,i,exp[i-par_start]);
+          p_AddExp(z,i,exp[i-par_start],r->algring);
       }
       pGetCoeff(term)=(number)omAlloc0Bin(rnumber_bin);
       ((lnumber)pGetCoeff(term))->z=z;
-      pSetm( term );
-      result = pAdd( result, term );
+      p_Setm( term,r );
+      result = p_Add_q( result, term, r );
     }
   }
@@ -342 +342 @@
 }
 
-static number convFactoryNSingAN( const CanonicalForm &f)
+static number convFactoryNSingAN( const CanonicalForm &f, const ring r)
 {
   if ( f.isImm() )
-    return n_Init( f.intval(), currRing->algring );
+    return n_Init( f.intval(), r->algring );
   else
   {
@@ -370 +370 @@
 }
 
-napoly convFactoryASingA ( const CanonicalForm & f )
-{
-  napoly a=NULL;
-  napoly t;
+napoly convFactoryASingA ( const CanonicalForm & f, const ring r )
+{
+  poly a=NULL;
+  poly t;
   for( CFIterator i=f; i.hasTerms(); i++)
   {
     t=napNew();
     // pNext( t ) = NULL; //already done by napNew
-    napGetCoeff(t)=convFactoryNSingAN( i.coeff() );
-    if (n_IsZero(napGetCoeff(t),currRing->algring))
-    {
-      p_Delete(&t,nacRing);
-    }
-    else
-    {
-      napSetExp(t,1,i.exp());
-      a=napAdd(a,t);
+    pGetCoeff(t)=convFactoryNSingAN( i.coeff(), r );
+    if (n_IsZero(napGetCoeff(t),r->algring))
+    {
+      p_Delete(&t,r->algring);
+    }
+    else
+    {
+      p_SetExp(t,1,i.exp(),r->algring);
+      a=p_Add_q(a,t,r->algring);
     }
   }
   if (a!=NULL)
   {
-    if (naMinimalPoly!=NULL)
-    {
-      if (p_GetExp(a,1,currRing->algring) >= p_GetExp(naMinimalPoly,1,currRing->algring))
-        a = napRemainder( a, naMinimalPoly);
+    if (r->minpoly!=NULL)
+    {
+      lnumber l=(lnumber)r->minpoly;
+      if (p_GetExp(a,1,r->algring) >= p_GetExp(l->z,1,r->algring))
+        a = napRemainder( a, l->z);
     }
   }

kernel/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.7 2009-09-16 12:26:26 Singular Exp $
+// $Id: clapconv.h,v 1.8 2009-10-16 10:29:28 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -20 +20 @@
 
 CanonicalForm convSingAPFactoryAP ( poly p , const Variable & a, const ring r );
-poly convFactoryAPSingAP ( const CanonicalForm & f );
+poly convFactoryAPSingAP ( const CanonicalForm & f, const ring r );
 poly convFactoryAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start );
 
@@ -27 +27 @@
 
 CanonicalForm convSingAFactoryA ( napoly p , const Variable & a, const ring r );
-napoly convFactoryASingA ( const CanonicalForm & f );
+napoly convFactoryASingA ( const CanonicalForm & f, const ring r );
 
 CanonicalForm convSingTrPFactoryP ( poly p, const ring r=currRing );