Changeset 94a065c in git

Timestamp:

Aug 12, 2011, 5:19:07 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e824171d985f5ae877a9d889f80c776454e5db4d

Parents:

cfecd22c01301e6e57986bb28c493771a672a424

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 17:19:07+02:00

git-committer:

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

Message:

fix cfImPart (coeffs.h)

Files:

• Singular/iparith.cc (modified) (5 diffs)
• Singular/table.h (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)

Singular/iparith.cc

@@ -4124 +4124 @@
 static BOOLEAN jjL2R(leftv res, leftv v)
 {
-  res->data=(char *)syConvList((lists)v->Data());
+  res->data=(char *)syConvList((lists)v->Data(),FALSE);
   if (res->data != NULL)
     return FALSE;
@@ -4209 +4209 @@
     typedef struct snumber_dummy  *number_dummy;
  
-    number_dummy z=(number)omAlloc(sizeof(snumber_dummy));
+    number_dummy z=(number_dummy)omAlloc(sizeof(snumber_dummy));
     #if defined(LDEBUG)
     z->debug=123456;
@@ -4431 +4431 @@
     return TRUE;
   }
-  res->data = (char *)(long)n_Int(pGetCoeff(p),currRing);
+  res->data = (char *)(long)n_Int(pGetCoeff(p),currRing->cf);
   return FALSE;
 }
@@ -6359 +6359 @@
   if(v4!=NULL)
   {
-    w=iv2array((intvec *)v4->Data());
+    w=iv2array((intvec *)v4->Data(),currRing);
     short *w0=w+1;
     int i=currRing->N;
@@ -7189 +7189 @@
     poly h0 = pSubst(pCopy(h), xIndex, NULL);
     intvec* v = NULL;
-    ideal i = singclap_factorize(h0, &v, 0);
+    ideal i = singclap_factorize(h0, &v, 0,currRing);
 
     ivTest(v);

Singular/table.h

@@ -46 +46 @@
 ,{D(jjCHAR),       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
 #ifdef HAVE_FACTORY
-,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
+// need LIBFAC
+//,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}
 #else
 ,{  jjWRONG ,      CHAR_SERIES_CMD, MATRIX_CMD,     IDEAL_CMD     , NO_PLURAL |NO_RING}

libpolys/coeffs/coeffs.h

@@ -609 +609 @@
 {
   assume(cf != NULL); assume(cf->cfImPart!=NULL); 
-  return cf->cfImpart(i,cf);
+  return cf->cfImPart(i,cf);
 }