Changeset 2e467b in git

Timestamp:

Mar 15, 1999, 1:23:41 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

cbc84b566a8243fb3545d987bbb1dd67a9171ee9

Parents:

70fa9a9325e89b413a16b1300d6f3dc1b470f9b2

Message:

*hannes: added weights to rSum


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

File:

• Singular/ring.cc (modified) (6 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.45 1999-03-11 15:58:09 Singular Exp $ */
+/* $Id: ring.cc,v 1.46 1999-03-15 12:23:41 Singular Exp $ */
 
 /*
@@ -1672 +1672 @@
     tmpR.block1=(int*)Alloc0(b*sizeof(int));
     tmpR.wvhdl=(short**)Alloc0(b*sizeof(short*));
-    /* weights not implemented yet ...*/
     if (rb!=NULL)
     {
@@ -1690 +1689 @@
         tmpR.block0[i]=r1->block0[i];
         tmpR.block1[i]=r1->block1[i];
+        if (r1->wvhdl[i]!=NULL)
+        {
+          int l=mmSizeL(r1->wvhdl[i]);
+          tmpR.wvhdl[i]=(short *)AllocL(l);
+          memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l);
+        }
       }
       j=i;
@@ -1707 +1712 @@
           tmpR.block0[j]=r2->block0[i]+r1->N;
           tmpR.block1[j]=r2->block1[i]+r1->N;
+          if (r2->wvhdl[i]!=NULL)
+          {
+            int l=mmSizeL(r2->wvhdl[i]);
+            tmpR.wvhdl[i]=(short *)AllocL(l);
+            memcpy(tmpR.wvhdl[i],r2->wvhdl[i],l);
+          }
         }
       }
@@ -1722 +1733 @@
     tmpR.block1=(int*)Alloc0(b*sizeof(int));
     tmpR.wvhdl=(short**)Alloc0(b*sizeof(short*));
-    /* weights not implemented yet ...*/
     for (i=0;i<b;i++)
     {
@@ -1728 +1738 @@
       tmpR.block0[i]=r1->block0[i];
       tmpR.block1[i]=r1->block1[i];
+      if (r1->wvhdl[i]!=NULL)
+      {
+        int l=mmSizeL(r1->wvhdl[i]);
+        tmpR.wvhdl[i]=(short *)AllocL(l);
+        memcpy(tmpR.wvhdl[i],r1->wvhdl[i],l);
+      }
     }
     tmpR.OrdSgn=r1->OrdSgn;