Changeset f52b35d in git

Timestamp:

Mar 4, 2007, 7:24:46 PM (17 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

112e09d6ab39fad0f75d42a5618b98a6a70f20e3

Parents:

cbc372f1d6bba1dc057875ed3c0faeac5d926e88

Message:

*levandov: ratNF for noncomm rational GB introduced


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

File:

• Singular/extra.cc (modified) (6 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.249 2007-01-11 11:24:12 Singular Exp $ */
+/* $Id: extra.cc,v 1.250 2007-03-04 18:24:46 levandov Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -84 +84 @@
 #include "sca.h"
 #include "ipconv.h"
+#include "ratgring.h"
 #endif
 
@@ -676 +677 @@
    }
    else
-   #endif
+#endif
 #ifdef HAVE_PLURAL
 /*==================== Approx_Step  =================*/
-      if (strcmp(sys_cmd, "astep") == 0)
-      {
-        ideal I;
-        if ((h!=NULL) && (h->Typ()==IDEAL_CMD))
-        {
-          I=(ideal)h->CopyD();
-          res->rtyp=IDEAL_CMD;
-          if (rIsPluralRing(currRing)) res->data=Approx_Step(I);
-          else res->data=I;
-          setFlag(res,FLAG_STD);
-        }
-        else return TRUE;
-        return FALSE;
-      }
+     if (strcmp(sys_cmd, "astep") == 0)
+     {
+       ideal I;
+       if ((h!=NULL) && (h->Typ()==IDEAL_CMD))
+       {
+         I=(ideal)h->CopyD();
+         res->rtyp=IDEAL_CMD;
+         if (rIsPluralRing(currRing)) res->data=Approx_Step(I);
+         else res->data=I;
+         setFlag(res,FLAG_STD);
+       }
+       else return TRUE;
+       return FALSE;
+     }
 /*==================== PrintMat  =================*/
-      if (strcmp(sys_cmd, "PrintMat") == 0)
-      {
+    if (strcmp(sys_cmd, "PrintMat") == 0)
+    {
         int a;
         int b;
@@ -1866 +1867 @@
 #include "mpsr.h"
 #include "mod_raw.h"
+#include "ratgring.h"
 
 static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h)
@@ -2611 +2613 @@
       return TRUE;
     }
+    else
+/*==================== RatNF, noncomm rational coeffs =================*/
+    if (strcmp(sys_cmd, "ratNF") == 0)
+    {
+      poly p,q;
+      int is;
+      if ((h!=NULL) && (h->Typ()==POLY_CMD))
+      {
+        p=(poly)h->CopyD();
+        h=h->next;
+      }
+      else return TRUE;
+      if ((h!=NULL) && (h->Typ()==POLY_CMD))
+      {
+        q=(poly)h->CopyD();
+        h=h->next;
+      }
+      else return TRUE;
+      if ((h!=NULL) && (h->Typ()==INT_CMD))
+      {
+        is=(int)((long)(h->Data()));
+        res->rtyp=POLY_CMD;
+        if (rIsPluralRing(currRing))
+        { 
+          res->data = nc_rat_ReduceSpolyNew(p, q, is, currRing);
+        }
+        else res->data=p;
+      }
+      else return TRUE;
+      return FALSE;
+    }
+    else
 #endif
 /*==================== t-rep-GB ==================================*/
@@ -2871 +2905 @@
     else
               */
+
+
 #endif
 /*==================== Error =================*/