Changeset 85fd90 in git

Timestamp:

Sep 28, 2011, 5:48:27 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d56ad872d739d42e59b1beb8ccc89be2a204530d

Parents:

32cc7e437ee85bf7d555756eb824eadce50d50c7

git-author:

Burcin Erocal <burcin@erocal.org>2011-09-28 17:48:27+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:41+01:00

Message:

Fix rChangeCurrRing and make the interpreter pass precision info to real/complex coeffs constructor.

Files:

• Singular/ipshell.cc (modified) (2 diffs)
• kernel/polys.cc (modified) (1 diff)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -5025 +5025 @@
   && ((strcmp(pn->name,"real")==0) || (strcmp(pn->name,"complex")==0)))
   {
+    LongComplexInfo param;
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
     const int ch=0;
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
-      WarnS("not implemented: size for real/complex");
       float_len=(int)(long)pn->next->Data();
       float_len2=float_len;
@@ -5036 +5036 @@
       {
         float_len2=(int)(long)pn->next->Data();
-        WarnS("not implemented: size for real/complex");
         pn=pn->next;
       }
     }
-    if ((pn->next==NULL) && complex_flag)
-    {
-      pn->next=(leftv)omAlloc0Bin(sleftv_bin);
-      pn->next->name=omStrDup("i");
-    }
-    else
-      WarnS("not implemented: name for i (complex)");
-    cf=nInitChar(complex_flag ? n_long_C: n_long_R,NULL);
+    // set the parameter name
+    if (complex_flag) {
+      if (pn->next == NULL)
+        param.par_name=(const char*)"i"; //default to i
+      else
+        param.par_name = (const char*)pn->next->name;
+    }
+
+    param.float_len = float_len;
+    param.float_len2 = float_len2;
+    cf=nInitChar(complex_flag ? n_long_C: n_long_R, (void*)&param);
 
     assume( cf != NULL );

kernel/polys.cc

@@ -10 +10 @@
 ideal currQuotient = NULL;
 
+/* -------------------------------------------------------- */
+/*2
+* change all global variables to fit the description of the new ring
+*/
+
+void p_SetGlobals(const ring r, BOOLEAN complete)
+{
+// // //  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r); // ???
+
+  if (complete)
+  {
+    test &= ~ TEST_RINGDEP_OPTS;
+    test |= r->options;
+  }
+}
+
 void rChangeCurrRing(ring r)
 {
    currRing = r;
    currQuotient = r->qideal;
-   test &= ~ TEST_RINGDEP_OPTS;
-   test |= r->options;
+   //------------ global variables related to coefficients ------------
+   nSetChar(r->cf);
+   //------------ global variables related to polys -------------------
+   p_SetGlobals(r);
 }
+/*
+
+/// internally changes the gloabl ring and resets the relevant
+/// global variables:
+/// SHOULD BE DEPRECATED NOW...?
+void rChangeCurrRing(ring r)
+{
+ // if (!rMinpolyIsNULL(currRing))
+ // {
+ //   omCheckAddr(currRing->cf->minpoly);
+ // }
+  //------------ set global ring vars --------------------------------
+  //currRing = r;
+  //currQuotient=NULL;
+  if (r != NULL)
+  {
+    rTest(r);
+    //------------ set global ring vars --------------------------------
+    //currQuotient=r->qideal;
+
+    //------------ global variables related to coefficients ------------
+    nSetChar(r->cf);
+
+    //------------ global variables related to polys -------------------
+    p_SetGlobals(r);
+    //------------ global variables related to factory -----------------
+  }
+}
+*/

kernel/polys.h

@@ -13 +13 @@
 
 extern ring currRing;
-extern void rChangeCurrRing(ring r);
+void rChangeCurrRing(ring r);
+
+void p_SetGlobals(const ring r, BOOLEAN complete = TRUE);
 
 #include <coeffs/numbers.h>

libpolys/polys/monomials/p_polys.cc

@@ -2958 +2958 @@
 }
 
-/* -------------------------------------------------------- */
-/*2
-* change all global variables to fit the description of the new ring
-*/
-
-void p_SetGlobals(const ring r, BOOLEAN complete)
-{
-// // //  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r); // ???
-
-  if (complete)
-  {
-    test &= ~ TEST_RINGDEP_OPTS;
-    test |= r->options;
-  }
-}
 //
 // resets the pFDeg and pLDeg: if pLDeg is not given, it is

libpolys/polys/monomials/p_polys.h

@@ -1890 +1890 @@
 
 /*-------------ring management:----------------------*/
-void p_SetGlobals(const ring r, BOOLEAN complete = TRUE);
 
 // resets the pFDeg and pLDeg: if pLDeg is not given, it is

libpolys/polys/monomials/ring.cc

@@ -102 +102 @@
 //  return FALSE;
 //}
-
-/*
-
-/// internally changes the gloabl ring and resets the relevant
-/// global variables:
-/// SHOULD BE DEPRECATED NOW...?
-void rChangeCurrRing(ring r)
-{
- // if (!rMinpolyIsNULL(currRing))
- // {
- //   omCheckAddr(currRing->cf->minpoly);
- // }
-  //------------ set global ring vars --------------------------------
-  //currRing = r;
-  //currQuotient=NULL;
-  if (r != NULL)
-  {
-    rTest(r);
-    //------------ set global ring vars --------------------------------
-    //currQuotient=r->qideal;
-
-    //------------ global variables related to coefficients ------------
-    nSetChar(r->cf);
-
-    //------------ global variables related to polys -------------------
-    p_SetGlobals(r);
-    //------------ global variables related to factory -----------------
-  }
-}
-*/
 
 ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)