Changeset 8d8fef in git for Singular/LIB/surfex.lib

Timestamp:

Jul 29, 2019, 11:36:09 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

feed60bef09898f675e0f8605ed0ac0eaa8bed5a

Parents:

da1ec3de158a4f05384b9a83be86fc4c1942ec5fc1b9ababa50e8059dd847da0957f50aea901e6a8

Message:

Merge branch 'machine_learning' of github.com:MHeymann/Sources into machine_learning

File:

• Singular/LIB/surfex.lib (modified) (5 diffs)

Singular/LIB/surfex.lib

@@ -38 +38 @@
 LIB "sing.lib";
 LIB "surf.lib";
-
+LIB "ring.lib";
 ///////////////////////////////////////////////////////////
 //
@@ -286 +286 @@
                                     string str_num_mp = "number "+parstr(1)+"="+
                                         decstr2ratstr(rootminpoly())+";";
-                                    execute("ring Iring = 0,("
-//                                            +string(coords)+","+str_para+"),dp;");
-                                            +string(coords)+"),dp;");
+                                    ring Iring = create_ring(0, "("+string(coords)+")", "dp"); 
                                     basering;
                                     execute(str_num_mp);
@@ -308 +306 @@
                             string str_tmp_l = "ideal eqd_tmp = "+string(tmp_l)+";";
                             def cur_ring = basering;
-                            execute("ring Iring = (real,30),("+string(coords)+"),("+ordstr(oring)+");");
+                            ring Iring = create_ring("(real,30)", "("+string(coords)+")", "("+ordstr(oring)+")"); 
 //                            basering;
                             execute(str_I);
@@ -1023 +1021 @@
                     if(minp==1) {
                         // switch to a ring without minimal polynomial:
-                        execute("ring rr = (real,30,30),("+varstr(base)+"), dp;");
+                        ring rr = create_ring("(real,30,30)", "("+varstr(base)+")", "dp");
 //                        rr;
 //                        "str_I",str_I;
@@ -1044 +1042 @@
                 if(n-params==3) {
                     p=cleardenom(p);
-                    execute("ring rr = (real,30,30),("+varstr(base)+","+parstr(base)+"), dp;");
+                    ring rr = create_ring("(real,30,30)", "("+varstr(base)+","+parstr(base)+")", "dp");
                     rr;
                     "str_I",str_I;