Changeset 70be3a in git for Singular

Timestamp:

May 19, 2015, 12:42:20 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

9492956fc07a12208a84a518c1334fd7c747e283

Parents:

530df5694d913482bbc03f7ebe601e4ee58dfc0a

Message:

Singular_4_1: assign int/number -> cnumber

Location:

Singular

Files:

• ipassign.cc (modified) (2 diffs)
• table.h (modified) (1 diff)

Singular/ipassign.cc

@@ -458 +458 @@
   }
   jiAssignAttr(res,a);
+  return FALSE;
+}
+static BOOLEAN jiA_NUMBER2_I(leftv res, leftv a, Subexpr e)
+{
+  if (e==NULL)
+  {
+    if (res->data!=NULL)
+    {
+      number2 nn=(number2)res->data;
+      number2 n=n2Init((long)a->Data(),nn->cf);
+      n2Delete(nn);
+      res->data=(void *)n;
+    }
+    else
+    {
+      WerrorS("no (c)ring avialable for conversion from int");
+      return TRUE;
+    }
+  }
+  else
+  {
+    int i=e->start-1;
+    if (i<0)
+    {
+      Werror("index[%d] must be positive",i+1);
+      return TRUE;
+    }
+    bigintmat *iv=(bigintmat *)res->data;
+    if (e->next==NULL)
+    {
+      WerrorS("only one index given");
+      return TRUE;
+    }
+    else
+    {
+      int c=e->next->start;
+      if ((i>=iv->rows())||(c<1)||(c>iv->cols()))
+      {
+        Werror("wrong range [%d,%d] in cmatrix %s(%d,%d)",i+1,c,res->Name(),iv->rows(),iv->cols());
+        return TRUE;
+      }
+      else
+      {
+        n_Delete((number *)&BIMATELEM(*iv,i+1,c),iv->basecoeffs());
+        BIMATELEM(*iv,i+1,c) = n_Init((long)a->Data(),iv->basecoeffs());
+      }
+    }
+  }
+  return FALSE;
+}
+static BOOLEAN jiA_NUMBER2_N(leftv res, leftv a, Subexpr e)
+{
+  if (e==NULL)
+  {
+    if (res->data!=NULL)
+    {
+      number2 nn=(number2)res->data;
+      if (currRing->cf==nn->cf)
+      {
+        number2 n=(number2)omAlloc(sizeof(*n));
+        n->cf=currRing->cf; n->cf++;
+        n->n=(number)a->CopyD(NUMBER_CMD);
+        n2Delete(nn);
+        res->data=(void *)n;
+      }
+      else
+      {
+        WerrorS("different base");
+        return TRUE;
+      }
+    }
+    else
+    {
+      WerrorS("no (c)ring avialable for conversion from number");
+      return TRUE;
+    }
+  }
+  else
+  {
+    int i=e->start-1;
+    if (i<0)
+    {
+      Werror("index[%d] must be positive",i+1);
+      return TRUE;
+    }
+    bigintmat *iv=(bigintmat *)res->data;
+    if (e->next==NULL)
+    {
+      WerrorS("only one index given");
+      return TRUE;
+    }
+    else
+    {
+      int c=e->next->start;
+      if ((i>=iv->rows())||(c<1)||(c>iv->cols()))
+      {
+        Werror("wrong range [%d,%d] in cmatrix %s(%d,%d)",i+1,c,res->Name(),iv->rows(),iv->cols());
+        return TRUE;
+      }
+      else if (iv->basecoeffs()==currRing->cf)
+      {
+        n_Delete((number *)&BIMATELEM(*iv,i+1,c),iv->basecoeffs());
+        BIMATELEM(*iv,i+1,c) = (number)(a->CopyD(NUMBER_CMD));
+      }
+      else
+      {
+        WerrorS("different base");
+        return TRUE;
+      }
+    }
+  }
   return FALSE;
 }
@@ -1908 +2019 @@
         if (module_assign)
         {
-          rk=0;
+          rk=0;
           mtyp=MODUL_CMD;
           etyp=VECTOR_CMD;
         }
-        else
-          rk=1;
+        else
+          rk=1;
       }
 

Singular/table.h

@@ -1221 +1221 @@
 ,{D(jiA_BIGINTMAT),CMATRIX_CMD,    CMATRIX_CMD}
 ,{D(jiA_NUMBER2),  CNUMBER_CMD,    CNUMBER_CMD }
+,{D(jiA_NUMBER2_I),CNUMBER_CMD,    INT_CMD }
+,{D(jiA_NUMBER2_N),CNUMBER_CMD,    NUMBER_CMD }
 ,{D(jiA_CRING),    CRING_CMD,      CRING_CMD }
 #endif