Changeset 6a0bf0 in git

Timestamp:

Aug 5, 2014, 2:23:35 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

468a2b59e7c1fc2e01bdad34042ac42460c27299

Parents:

53bb4c6073c677719bb2ec2cff900750e45804edd6d9368ea0fd06d0387039f01a3bafa5e047063f

Message:

Merge branch 'fix.baseringchange.algebra.is_injective' of https://github.com/surface-smoothers/Sources into surface-smoothers-fix.baseringchange.algebra.is_injective

Conflicts:
	Tst/Short.lst

Files:

• Singular/LIB/algebra.lib (modified) (1 diff)
• Singular/LIB/primdec.lib (modified) (4 diffs)
• Singular/iparith.cc (modified) (1 diff)
• Tst/Short.lst (modified) (1 diff)
• Tst/Short/bug_583.res.gz.uu (added)
• Tst/Short/bug_583.stat (added)
• Tst/Short/bug_583.tst (added)
• Tst/Short/bug_611.res.gz.uu (added)
• Tst/Short/bug_611.stat (added)
• Tst/Short/bug_611.tst (added)
• Tst/Short/bug_632.res.gz.uu (added)
• Tst/Short/bug_632.stat (added)
• Tst/Short/bug_632.tst (added)
• Tst/Short/bug_633.res.gz.uu (added)
• Tst/Short/bug_633.stat (added)
• Tst/Short/bug_633.tst (added)
• doc/reference.doc (modified) (previous)

Singular/LIB/algebra.lib

@@ -587 +587 @@
       L[1] = size(NF(psi(ker),std(0))) == 0;
     }
+    setring bsr;
     if ( defined(pau) != voice )
     {  return (L[1]);

Singular/LIB/primdec.lib

@@ -4091 +4091 @@
   list re=sres(i,0);                   //the resolution
   re=minres(re);                       //minimized resolution
-  ideal ann=AnnExt_R(e,re);
-  if(nvars(basering)-dim(std(ann))!=e)
-  {
-    return(ideal(1));
+  ideal ann = AnnExt_R(e,re);
+  if ( nvars(basering)-dim(std(ann)) != e )
+  {
+    return( ideal(1) );
   }
   return(ann);
@@ -4103 +4103 @@
 //computes the annihilator of Ext^n(R/i,R) with given resolution re
 //n is not necessarily the number of variables
+// !! borrowed correct code from 'ehv.lib::AnnExtEHV' by Kai Dehmann !! duplicate code!! (jk)
+
 static proc AnnExt_R(int n,list re)
+"USAGE:   AnnExt_R(n,re); n integer, re resolution
+RETURN:  ideal, the annihilator of Ext^n(R/I,R) with given
+         resolution re of I
+"
 {
 
-  if(n<nvars(basering))
-  {
-    if(size(re[n+1])>0)
-    {
-        matrix f=transpose(re[n+1]);      //Hom(_,R)
-        module k=nres(f,2)[2];            //the kernel
-        matrix g=transpose(re[n]);        //the image of Hom(_,R)
-
-        ideal ann=quotient1(g,k);         //the anihilator
-        return(ann);
-    }
-  }
-  // remaining case: re[n+1] is trivial
-  // either n is at least number of variables or
-  // resolution happens to be shorter
-  ideal ann=Ann(transpose(re[n]));
+  if(n < 0)
+    {
+      ideal ann = ideal(1);
+      return(ann);
+    }
+  int l = size(re);
+
+  if(n < l)
+    {
+      matrix f = transpose(re[n+1]);
+      if(n == 0)
+        {
+          matrix g = 0*gen(ncols(f));
+        }
+      else
+        {
+          matrix g = transpose(re[n]);
+        }
+      module k = syz(f);
+      ideal ann = quotient1(g,k);
+      return(ann);
+    }
+
+  if(n == l)
+    {
+      ideal ann = Ann(transpose(re[n]));
+      return(ann);
+    }
+
+  ideal ann = ideal(1);
   return(ann);
 }
@@ -6665 +6685 @@
   if(homog(i)==1)
   {
-     list re=sres(j,0);                   //the resolution
+     resolution re=sres(j,0);                   //the resolution
      re=minres(re);                       //minimized resolution
   }
@@ -6711 +6731 @@
   ideal j=groebner(i);
   int cod=nvars(basering)-dim(j);
+
+
+  if(cod > nvars(basering))
+    {
+      dbprint(printlevel,"//If I is the entire ring...");
+      dbprint(printlevel,"//...then return the ideal generated by 1.");
+      return(ideal(1));
+    }
+
   int e;
   ideal ann;
   if(homog(i)==1)
   {
-     list re=sres(j,0);                   //the resolution
+     resolution re=sres(j,0);                   //the resolution
      re=minres(re);                       //minimized resolution
   }
   else
   {
-    list re=mres(j,0);
-  }
-  ann=AnnExt_R(cod,re);
+    resolution re=mres(j,0);
+  }
+  ann = AnnExt_R(cod,re);
+  if( nvars(basering)-dim(std(ann) ) != cod)
+  {
+     return( ideal(1) );
+  }
+
   return(ann);
 }

Singular/iparith.cc

@@ -2991 +2991 @@
   int i=(int)(long)u->Data();
   int j=(int)(long)v->Data();
+  if (j-i <0) {WerrorS("invalid range for random"); return TRUE;}
   res->data =(char *)(long)((i > j) ? i : (siRand() % (j-i+1)) + i);
   return FALSE;

Tst/Short.lst

@@ -68 +68 @@
 Short/bug_613.tst
 Short/bug_632.tst
+Short/bug_633.tst
 Short/bug_7.tst
 Short/bug_8.tst