Changeset f305be1 in git

Timestamp:

Feb 12, 2014, 1:07:49 PM (10 years ago)

Author:

Jakob Kröker <kroeker@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

be7a5d1166e45033b6b760b23ded5cc68cb2fe00

Parents:

ecd9982365d7c692c14dbe634aa691153c756230

Message:

fixed basering related issues

File:

• Singular/LIB/normal.lib (modified) (7 diffs)

Singular/LIB/normal.lib

@@ -2751 +2751 @@
         }
         if(w>=1){"Newton-Polygon is non-degenerated";"";}
+        setring R;
         option(set,save_opt);
         return(list(d*(mu+nb-1) div 2,d*tau,d*nb));
@@ -2816 +2817 @@
         nb=size(HNEXP);
       }
+      setring R;
       option(set,save_opt);
       return(list(d*(mu+nb-1) div 2,d*tau,d*nb));
@@ -2824 +2826 @@
       if(w>=1){"now we have to use Hamburger-Noether (Puiseux) expansion";}
       delt=delta(f);
+      setring R;
       option(set,save_opt);
       return(list(d*delt,d*tau,d));
@@ -4243 +4246 @@
       pause();"";
     }
+    setring R;
     return(lastRing);
   }
@@ -6612 +6616 @@
     a = is_injective(Qnormap,QAS);          //a. Test for injectivity of Qnormap
     dbprint ( prl, "injective: "+string(a) );
-    if ( n==1 ) { return (a); }
+    if ( n==1 ) { 
+     def result = intvec(a);
+     setring BAS;
+     return (result); 
+   }
    a;
 
@@ -6619 +6627 @@
     b = mapIsFinite(normap,BAS,lnorid[2]);  //b. Test for finiteness of normap
     dbprint ( prl, "finite: "+string(b) );
-    if ( n==2 ) { return (intvec(a,b)); }
+    if ( n==2 ) { 
+       def result = intvec(a,b);
+       setring BAS;
+       return (result); 
+    }
    b;
 
@@ -6636 +6648 @@
     int d1 = (d==0);                           //d1=1 if delta=0
     dbprint ( prl, "delta: "+string(d) );
-    return(intvec(a,b,d1));
+    def result = intvec(a,b,d1);
+    setring BAS;
+    return(result);
 }
 example