Changeset d4c53a in git

Timestamp:

Oct 10, 2008, 5:49:08 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

cfb8edb7456b2ae7760ad4a0b9982a2128ca52d3

Parents:

36e34686a0b133e6f1ebe6746a9e6ece43a48cf7

Message:

*hannes: intmat=intvec


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

File:

• Singular/ipassign.cc (modified) (3 diffs)

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.98 2008-06-26 18:35:11 motsak Exp $ */
+/* $Id: ipassign.cc,v 1.99 2008-10-10 15:49:08 Singular Exp $ */
 
 /*
@@ -425 +425 @@
 static BOOLEAN jiA_INTVEC(leftv res, leftv a, Subexpr e)
 {
-  if (res->data!=NULL) delete ((intvec *)res->data);
-  res->data=(void *)a->CopyD(INTVEC_CMD);
-  jiAssignAttr(res,a);
-  return FALSE;
+  if ((res->data==NULL) || (res->Typ()==a->Typ()))
+  {
+    if (res->data!=NULL) delete ((intvec *)res->data);
+    res->data=(void *)a->CopyD(INTVEC_CMD);
+    jiAssignAttr(res,a);
+    return FALSE;
+  }
+  else
+  {
+    intvec *r=(intvec *)(res->data);
+    intvec *s=(intvec *)(a->data);
+    int i=si_min(r->length(), s->length())-1;
+    for(;i>=0;i--)
+    {
+      (*r)[i]=(*s)[i];
+    }
+    return (r->length()< s->length());
+  }
 }
 static BOOLEAN jiA_IDEAL(leftv res, leftv a, Subexpr e)
@@ -644 +658 @@
 ,{jiA_INTVEC,   INTVEC_CMD,     INTVEC_CMD }
 ,{jiA_INTVEC,   INTMAT_CMD,     INTMAT_CMD }
+,{jiA_INTVEC,   INTMAT_CMD,     INTVEC_CMD }
 ,{jiA_NUMBER,   NUMBER_CMD,     NUMBER_CMD }
 ,{jiA_BIGINT,   BIGINT_CMD,     BIGINT_CMD }