Changeset d1f231 in git for kernel/clapsing.cc

Timestamp:

Oct 16, 2009, 12:35:00 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e9806890fa4b234b8c11d976584cab53f617eb21

Parents:

aaf310683d51b31671eaa0c71091bd597e94f3a5

Message:

*hannes: more ring dep.


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

File:

• kernel/clapsing.cc (modified) (13 diffs)

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.45 2009-09-16 12:26:26 Singular Exp $
+// $Id: clapsing.cc,v 1.46 2009-10-16 10:35:00 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -87 +87 @@
         CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
                       G( convSingAPFactoryAP( g,a,r ) );
-        res= convFactoryAPSingAP( gcd( F, G ) );
+        res= convFactoryAPSingAP( gcd( F, G ),currRing );
         if (!b) Off(SW_USE_QGCD);
       }
@@ -181 +181 @@
       CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) ),
                     G( convSingAPFactoryAP( g,a,currRing ) );
-      res= convFactoryAPSingAP( resultant( F, G, X ) );
+      res= convFactoryAPSingAP( resultant( F, G, X ),currRing );
     }
     else
@@ -329 +329 @@
         return TRUE;
       }
-      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ) );
-      pa=convFactoryAPSingAP(Fa);
-      pb=convFactoryAPSingAP(Gb);
+      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),currRing );
+      pa=convFactoryAPSingAP(Fa,currRing);
+      pb=convFactoryAPSingAP(Gb,currRing);
     }
     else
@@ -406 +406 @@
         return TRUE;
       }
-      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ) );
-      pa=convFactoryAPSingAP(Fa);
-      pb=convFactoryAPSingAP(Gb);
+      res= convFactoryAPSingAP( extgcd( F, G, Fa, Gb ),currRing );
+      pa=convFactoryAPSingAP(Fa,currRing);
+      pb=convFactoryAPSingAP(Gb,currRing);
     }
     else
@@ -456 +456 @@
       CanonicalForm F( convSingAPFactoryAP( f,a,currRing ) ),
                     G( convSingAPFactoryAP( g,a,currRing ) );
-      res= convFactoryAPSingAP(  F / G  );
+      res= convFactoryAPSingAP(  F / G,currRing  );
     }
     else
@@ -462 +462 @@
       CanonicalForm F( convSingTrPFactoryP( f ) ), G( convSingTrPFactoryP( g ) );
       res= convFactoryPSingTrP(  F / G  );
+    }
+  }
+  #if 0 // not yet working
+  else if (rField_is_GF())
+  {
+    //Print("GF(%d^%d)\n",nfCharP,nfMinPoly[0]);
+    setCharacteristic( nfCharP,nfMinPoly[0], currRing->parameter[0][0] );
+    CanonicalForm F( convSingGFFactoryGF( f ) ), G( convSingGFFactoryGF( g ) );
+    res = convFactoryGFSingGF( F / G );
+  }
+  #endif
+  else
+    WerrorS( feNotImplemented );
+  Off(SW_RATIONAL);
+  return res;
+}
+
+poly singclap_pdivide_r ( poly f, poly g, const ring r )
+{
+  poly res=NULL;
+  On(SW_RATIONAL);
+  if (rField_is_Zp(r) || rField_is_Q(r))
+  {
+    setCharacteristic( n_GetChar(r) );
+    CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
+    res = convFactoryPSingP( F / G,r );
+  }
+  else if (rField_is_Extension(r))
+  {
+    if (rField_is_Q_a(r)) setCharacteristic( 0 );
+    else               setCharacteristic( -n_GetChar(r) );
+    if (r->minpoly!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(((lnumber)r->minpoly)->z,
+                                                 r->algring);
+      Variable a=rootOf(mipo);
+      CanonicalForm F( convSingAPFactoryAP( f,a,r ) ),
+                    G( convSingAPFactoryAP( g,a,r ) );
+      res= convFactoryAPSingAP(  F / G, r  );
+    }
+    else
+    {
+      CanonicalForm F( convSingTrPFactoryP( f,r ) ), G( convSingTrPFactoryP( g,r ) );
+      res= convFactoryPSingTrP(  F / G,r  );
     }
   }
@@ -640 +684 @@
           if (currRing->minpoly!=NULL)
           {
-            q= convFactoryAPSingAP(  Q  );
+            q= convFactoryAPSingAP(  Q,currRing  );
           }
           else
@@ -918 +962 @@
         else
         {
-          if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor() )))
+          if (!count_Factors(res,w,j,ff,convFactoryAPSingAP( J.getItem().factor(),currRing )))
           {
             if (w!=NULL)
@@ -1217 +1261 @@
           res->m[j]=convFactoryPSingTrP( J.getItem().factor() );
         else
-          res->m[j]=convFactoryAPSingAP( J.getItem().factor() );
+          res->m[j]=convFactoryAPSingAP( J.getItem().factor(),currRing );
       }
     }
@@ -1494 +1538 @@
         }
       }
-      res= convFactoryAPSingAP( determinant(M,r) ) ;
+      res= convFactoryAPSingAP( determinant(M,r),currRing ) ;
     }
     else
@@ -1552 +1596 @@
 
    // calculate lcm
-   res= convFactoryASingA( (F/GCD)*G );
+   res= convFactoryASingA( (F/GCD)*G,currRing );
  }
  else
@@ -1591 +1635 @@
    if ((GCD!=1) && (GCD!=0))
    {
-     ff= convFactoryASingA( F/ GCD );
-     gg= convFactoryASingA( G/ GCD );
+     ff= convFactoryASingA( F/ GCD, currRing );
+     gg= convFactoryASingA( G/ GCD, currRing );
    }
  }