Changeset d3af55 in git for kernel

Timestamp:

Aug 28, 2017, 3:53:02 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

639345cb183019a538568be59dbe1acb10fa6e52

Parents:

c796c8c22e0eb1646288441d49b98e3bed9b7086

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-08-28 15:53:02+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-08-28 15:59:15+02:00

Message:

add: new p_Divide(a,b,r): a/b, ignoring the rest

Location:

kernel

Files:

• polys.cc (modified) (2 diffs)
• polys.h (modified) (1 diff)

kernel/polys.cc

@@ -5 +5 @@
 
 #include "polys.h"
+#include "kernel/ideals.h"
+#include "kernel/ideals.h"
+#include "polys/clapsing.h"
 
 /// Widely used global variable which specifies the current polynomial ring for Singular interpreter and legacy implementatins.
@@ -36 +39 @@
   }
 }
-/*
-/// internally changes the gloabl ring and resets the relevant
-/// global variables:
-/// SHOULD BE DEPRECATED NOW...?
-void rChangeCurrRing(ring r)
+
+poly p_Divide(poly p, poly q, const ring r)
 {
- // if (!rMinpolyIsNULL(currRing))
- // {
- //   omCheckAddr(currRing->cf->minpoly);
- // }
-  //------------ set global ring vars --------------------------------
-  //currRing = r;
-  if (r != NULL)
-  {
-    rTest(r);
-    //------------ set global ring vars --------------------------------
-
-    //------------ global variables related to coefficients ------------
-    nSetChar(r->cf);
-
-    //------------ global variables related to polys -------------------
-    p_SetGlobals(r);
-    //------------ global variables related to factory -----------------
+  assume(q!=NULL);
+  if (p==NULL) return NULL;
+  if (pNext(q)!=NULL)
+  { /* This means that q != 0 consists of at least two terms*/
+    if(p_GetComp(p,r)==0)
+    {
+      if ((r->cf->convSingNFactoryN!=ndConvSingNFactoryN)
+      &&(!rField_is_Ring(r)))
+        return singclap_pdivide(p, q, r);
+      else
+      {
+        ideal vi=idInit(1,1); vi->m[0]=q;
+        ideal ui=idInit(1,1); ui->m[0]=p;
+        ideal R; matrix U;
+        if (r!=currRing)
+        {
+          WerrorS("internal error: idLift not in currRing");
+          return NULL;
+        }
+        ideal m = idLift(vi,ui,&R, FALSE,TRUE,TRUE,&U);
+        matrix T = id_Module2formatedMatrix(m,1,1,currRing);
+        p=MATELEM(T,1,1); MATELEM(T,1,1)=NULL;
+        id_Delete((ideal *)&T,r);
+        id_Delete((ideal *)&U,r);
+        id_Delete(&R,r);
+        vi->m[0]=NULL; ui->m[0]=NULL;
+        id_Delete(&vi,r);
+        id_Delete(&ui,r);
+        return p;
+      }
+    }
+    else
+    {
+      int comps=p_MaxComp(p,r);
+      ideal I=idInit(comps,1);
+      p=p_Copy(p,r);
+      poly h;
+      int i;
+      // conversion to a list of polys:
+      while (p!=NULL)
+      {
+        i=p_GetComp(p,r)-1;
+        h=pNext(p);
+        pNext(p)=NULL;
+        p_SetComp(p,0,r);
+        I->m[i]=p_Add_q(I->m[i],p,r);
+        p=h;
+      }
+      // division and conversion to vector:
+      h=NULL;
+      p=NULL;
+      for(i=comps-1;i>=0;i--)
+      {
+        if (I->m[i]!=NULL)
+        {
+          if ((r->cf->convSingNFactoryN!=ndConvSingNFactoryN)
+          &&(!rField_is_Ring(r)))
+            h=singclap_pdivide(I->m[i],q,r);
+          else
+          {
+            ideal vi=idInit(1,1); vi->m[0]=q;
+            ideal ui=idInit(1,1); ui->m[0]=I->m[i];
+            ideal R; matrix U;
+            if (r!=currRing)
+            {
+              WerrorS("internal error: idLift not in currRing");
+              return NULL;
+            }
+            ideal m = idLift(vi,ui,&R, FALSE,TRUE,TRUE,&U);
+            matrix T = id_Module2formatedMatrix(m,1,1,currRing);
+            h=MATELEM(T,1,1); MATELEM(T,1,1)=NULL;
+            id_Delete((ideal*)&T,r);
+            id_Delete((ideal*)&U,r);
+            id_Delete(&R,r);
+            vi->m[0]=NULL; ui->m[0]=NULL;
+            id_Delete(&vi,r);
+            id_Delete(&ui,r);
+          }
+          p_SetCompP(h,i+1,r);
+          p=p_Add_q(p,h,r);
+        }
+      }
+      id_Delete(&I,r);
+      return p;
+    }
   }
+  else
+  { /* This means that q != 0 consists of just one term,
+       or that currRing is over a coefficient ring. */
+#ifdef HAVE_RINGS
+    if (!rField_is_Domain(currRing))
+    {
+      WerrorS("division only defined over coefficient domains");
+      return NULL;
+    }
+    if (pNext(q)!=NULL)
+    {
+      WerrorS("division over a coefficient domain only implemented for terms");
+      return NULL;
+    }
+#endif
+    return p_DivideM(p_Copy(p,r),p_Head(q,r),r);
+  }
+  return FALSE;
 }
-*/

kernel/polys.h

@@ -160 +160 @@
 #endif
 
+/// polynomial division, ignoring the rest
+/// via singclap_pdiive resp. idLift
+poly p_Divide(poly a, poly b, const ring r);
 /***************************************************************
  *