Changeset 561f4c in git

Timestamp:

Feb 3, 2005, 5:41:29 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

88d2e58c77928c255914b18416c0f1345491e4b5

Parents:

41a8db552191ba08e3fca59cf4cf8401c8d58daf

Message:

*hannes: ring+qring etc.


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

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/ring.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.333 2004-11-12 10:44:52 Singular Exp $ */
+/* $Id: iparith.cc,v 1.334 2005-02-03 16:41:07 Singular Exp $ */
 
 /*
@@ -2481 +2481 @@
 ,{lAdd,        '+',            LIST_CMD,       LIST_CMD,   LIST_CMD ALLOW_PLURAL}
 ,{jjRSUM,      '+',            RING_CMD,       RING_CMD,   RING_CMD ALLOW_PLURAL}
+,{jjRSUM,      '+',            QRING_CMD,      QRING_CMD,  RING_CMD ALLOW_PLURAL}
+,{jjRSUM,      '+',            QRING_CMD,      RING_CMD,   QRING_CMD ALLOW_PLURAL}
+,{jjRSUM,      '+',            QRING_CMD,      QRING_CMD,  QRING_CMD ALLOW_PLURAL}
 ,{jjMINUS_I,   '-',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
 ,{jjMINUS_N,   '-',            NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.27 2004-10-29 18:48:41 levandov Exp $ */
+/* $Id: ring.cc,v 1.28 2005-02-03 16:41:29 Singular Exp $ */
 
 /*
@@ -1206 +1206 @@
   }
 #endif
+  if (r1->qideal!=NULL)
+  {
+    if (r2->qideal!=NULL)
+    {
+      WerrorS("todo: qring+qring"); 
+      return -1;
+    }
+    else
+    {
+      int * perm=(int*)omAlloc0(sizeof(int)*(sum->N+1));
+      int i;
+      for(i=1;i<=r1->N;i++) perm[i]=i;
+      sum->qideal=idInit(IDELEMS(r1->qideal),1);
+      for (int i=0;i<IDELEMS(r1->qideal);i++)
+        sum->qideal->m[i]=pPermPoly(r1->qideal->m[i],perm,r1,nCopy);
+      omFree((ADDRESS)perm);
+    }
+  }
+  else if (r2->qideal!=NULL)
+  {
+    int * perm=(int*)omAlloc0(sizeof(int)*(sum->N+1));
+    int i;
+    for(i=1;i<=r2->N;i++) perm[i]=i+r1->N;
+    sum->qideal=idInit(IDELEMS(r2->qideal),1);
+    for (int i=0;i<IDELEMS(r2->qideal);i++)
+      sum->qideal->m[i]=pPermPoly(r2->qideal->m[i],perm,r2,nCopy);
+    omFree((ADDRESS)perm);
+  }
   return 1;
 }