Changeset b45eec in git for Singular/LIB/gitfan.lib

Timestamp:

Apr 19, 2020, 9:57:14 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ffcf715a570941627bf020648e93955f1596f2ef

Parents:

d49a473d44aa25c5ecc3126360ab3179ddb8af7e636fa5455e699fa8c0a820dd60e00a059f96f8ef

Message:

Merge branch 'stable' into lp_Z

File:

• Singular/LIB/gitfan.lib (modified) (3 diffs)

Singular/LIB/gitfan.lib

@@ -331 +331 @@
   }
 
-  string initNewRing = "ring Rgam0 = 0,(";
+  string initNewRing = "(";
 
   intvec w = ringlist(basering)[3][1][2];
@@ -343 +343 @@
   w0[size(gam0)] = w[gam0[size(gam0)]];
 
-  initNewRing = initNewRing + string(var(gam0[size(gam0)])) + "),wp(w0);";
+  initNewRing = initNewRing + string(var(gam0[size(gam0)])) + ")";
   def R = basering;
-  execute(initNewRing);
+//  execute(initNewRing);
+  initNewRing;
+  ring Rgam0 = create_ring(0, initNewRing, "wp("+string(w0)+")");
+  ringlist(Rgam0);
 
   ideal agam0 = imap(R,a);
@@ -1964 +1967 @@
   list OC = orbitCones(AF,Q);
   bigintmat w[1][nrows(Q)];
-  for(int i = 1; i <= nrows(Q); i++){
-    w = w + Q[1..nrows(Q),i];
+  int j;
+  for(int i = 1; i <= nrows(Q); i++)
+  {
+    for(j=1;j<=nrows(Q);j++)
+    {
+      w[1,j]= w[1,j] + Q[1,i];
+    }
   }
   GITcone(OC,w);