Changeset afbc156 in git for Singular/ipconv.cc

Timestamp:

Dec 1, 2015, 3:40:16 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

dda8658f52c301a7a85c69e9d7c88b16ba19c66b

Parents:

1550e4d76ad2eeab9a8ff28e8424eb11e3fcf688

Message:

more chnages for SINGULAR_4_1

File:

• Singular/ipconv.cc (modified) (7 diffs)

Singular/ipconv.cc

@@ -28 +28 @@
 #include <polys/monomials/ring.h>
 #include <Singular/ipshell.h>
+#include <Singular/number2.h>
 #include <Singular/ipconv.h>
 
@@ -175 +176 @@
 }
 
+#ifdef SINGULAR_4_1
+static void * iiI2NN(void *data)
+{
+  if (currRing==NULL)
+  {
+    WerrorS("missing basering while converting int to Number");
+    return NULL;
+  }
+  number n=nInit((int)(long)data);
+  number2 nn=(number2)omAlloc(sizeof*nn);
+  nn->cf=currRing->cf; nn->cf->ref++;
+  nn->n=n;
+  return (void *)nn;
+}
+#endif
+
 static void * iiBI2N(void *data)
 {
@@ -188 +205 @@
   return (void*)n;
 }
+
+#ifdef SINGULAR_4_1
+static void * iiBI2NN(void *data)
+{
+  if (currRing==NULL)
+  {
+    WerrorS("missing basering while converting bigint to Number");
+    return NULL;
+  }
+  nMapFunc nMap=n_SetMap(coeffs_BIGINT,currRing->cf);
+  if (nMap==NULL)
+  {
+    Werror("no conversion from bigint to %s",currRing->cf->cfCoeffString(currRing->cf));
+    return NULL;
+  }
+  number n=nMap((number)data,coeffs_BIGINT,currRing->cf);
+  n_Delete((number *)&data, coeffs_BIGINT);
+  number2 nn=(number2)omAlloc(sizeof*nn);
+  nn->cf=currRing->cf; nn->cf->ref++;
+  return (void*)nn;
+}
+#endif
+
+#ifdef SINGULAR_4_1
+static void * iiNN2N(void *data)
+{
+  number2 d=(number2)data;
+  if ((currRing==NULL)
+  || (currRing->cf!=d->cf))
+  {
+    WerrorS("cannot convert: incompatible");
+    return NULL;
+  }
+  number n = n_Copy(d->n, d->cf);
+  n2Delete(d);
+  return (void*)n;
+}
+#endif
+
+#ifdef SINGULAR_4_1
+static void * iiNN2P(void *data)
+{
+  number2 d=(number2)data;
+  if ((currRing==NULL)
+  || (currRing->cf!=d->cf))
+  {
+    WerrorS("cannot convert: incompatible");
+    return NULL;
+  }
+  number n = n_Copy(d->n, d->cf);
+  n2Delete(d);
+  return (void*)p_NSet(n,currRing);
+}
+#endif
 
 static void * iiIm2Ma(void *data)
@@ -362 +433 @@
     output->next=input->next;
     input->next=NULL;
-    return FALSE;
+    return errorreported;
   }
   if (index!=0) /* iiTestConvert does not returned 'failure' */
@@ -395 +466 @@
         return TRUE;
       }
+      if (errorreported) return TRUE;
       output->next=input->next;
       input->next=NULL;
@@ -420 +492 @@
   if ((currRing==NULL) && (outputType>BEGIN_RING) && (outputType<END_RING))
     return 0;
+  //if ((currRing==NULL) && (outputType==CNUMBER_CMD))
+  //  return 0;
 
   // search the list
@@ -434 +508 @@
     i++;
   }
-  //Print("test convert %d to %d (%s -> %s):0\n",inputType,outputType,
-  // Tok2Cmdname(inputType), Tok2Cmdname(outputType));
+  //Print("test convert %d to %d (%s -> %s):0, tested:%d\n",inputType,outputType,
+  // Tok2Cmdname(inputType), Tok2Cmdname(outputType),i);
   return 0;
 }