Changeset 7259b3 in git

Timestamp:

Mar 19, 2019, 12:33:36 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e6ca692d11ed9f7aed14460a5e2329dd2ed58504

Parents:

5d2ecdf1fcb7fe9552bea340fbdb16b905a608a5

Message:

add: multiplicity to ccluster

File:

• Singular/extra.cc (modified) (1 diff)

Singular/extra.cc

@@ -3796 +3796 @@
             l->m[i].rtyp=LIST_CMD;
             l->m[i].data=ll;
-            ll->Init(2);
+            ll->Init(3);
             ll->m[0].rtyp=NUMBER_CMD;
             ll->m[1].rtyp=NUMBER_CMD;
+            ll->m[2].rtyp=INT_CMD;
             ll->m[0].data=convFlintNSingN(re_part[i]);
             ll->m[1].data=convFlintNSingN(im_part[i]);
+            ll->m[2].data=(char*)(long)mult[i];
           }
           // clear re, im
           for(int i=n-1;i>=0;i--) { fmpq_clear(re_part[i]); fmpq_clear(im_part[i]); }
-          omFree(re_part);
-          omFree(im_part);
+          omFreeSize(re_part,n*sizeof(fmpq_t));
+          omFreeSize(im_part,n*sizeof(fmpq_t));
+          omFreeSize(mult,n*sizeof(int));
           // result
           res->rtyp=LIST_CMD;