Changeset 7a09e1d in git for Singular/LIB/ellipticcovers.lib

Timestamp:

Sep 10, 2013, 7:28:50 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4049491feb1f9f52f927026394356d3dc0bff1ab

Parents:

1b70fe982adba74b2d7a2f4766d7ec6d103a2cf2d18df5f1f6b128c177729f69cdcb63493d3b8277

Message:

Merge branch 'spielwiese' of https://github.com/jankoboehm/Sources into jankoboehm-spielwiese

Conflicts solved:
	Singular/ipshell.cc
	libpolys/polys/ext_fields/transext.cc
	libpolys/polys/monomials/ring.h

File:

• Singular/LIB/ellipticcovers.lib (modified) (4 diffs)

Singular/LIB/ellipticcovers.lib

@@ -213 +213 @@
   }
   if ((typeof(xy)=="graph")||(typeof(d)=="list"))  {
-    list xl = ringlist(R)[1][2];
+    list xl = ringlist(basering)[1][2];
     list ed = xy.edges;
     number f=1;
@@ -408 +408 @@
   if (typeof(P)=="graph"){
      if (size(#)>1){
-       return(gromovWitten(propagator(G,#)));
+       return(gromovWitten(propagator(P,#)));
      } else {
       int d =#[1];
@@ -416 +416 @@
       for (int j=1; j<=size(pa); j++) {
        ti=timer;
-       re[j]=gromovWitten(propagator(G,pa[j]));
+       re[j]=gromovWitten(propagator(P,pa[j]));
        ti=timer-ti;
        //print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(sum(re))+"     "+string(ti));
@@ -461 +461 @@
        ti=timer;
        //pararg[j]=list(propagator(G,pa[j]));
-       re[j]=gromovWitten(propagator(G,pa[j]));
+       re[j]=gromovWitten(propagator(P,pa[j]));
        ti=timer-ti;
        if (vb>0){print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(sum(re))+"     "+string(ti));}