Changeset 7161aca in git for Singular/dyn_modules/freealgebra/freealgebra.cc

Timestamp:

Aug 12, 2019, 11:10:44 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8307d2d92aa305b1a9b4e0c9353dfc467f913461

Parents:

d4cec6ab781a81162945ff680935242fcccc952ab258e2adb78434353acc85388a6c40c626c4b5ee

Message:

Merge branch 'spielwiese' into stable

File:

• Singular/dyn_modules/freealgebra/freealgebra.cc (modified) (2 diffs)

Singular/dyn_modules/freealgebra/freealgebra.cc

@@ -6 +6 @@
 {
   const short t1[]={2,RING_CMD,INT_CMD};
-  if (iiCheckTypes(args,t1,1))
+  const short t2[]={3,RING_CMD,INT_CMD,INT_CMD};
+  if (iiCheckTypes(args, t2, 0) || iiCheckTypes(args, t1, 1))
   {
     ring r=(ring)args->Data();
@@ -33 +34 @@
       return TRUE;
     }
-    ring R=freeAlgebra(r,d);
+    int ncGenCount = 0; 
+    if (iiCheckTypes(args,t2,0))
+      ncGenCount = (int)(long) args->next->next->Data();
+    ring R=freeAlgebra(r,d,ncGenCount);
     res->rtyp=RING_CMD;
     res->data=R;