Changeset 92550d in git

Timestamp:

May 20, 2014, 5:18:40 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

a770fe2fceb17640c0d38e02178754f465f6ef5b

Parents:

984ff3b24d0cfc0f0c40172a5ef29ced17fd6741

Message:

fix: handle empty char. series in primdec.lib

Files:

• Singular/LIB/primdec.lib (modified) (3 diffs)
• Tst/Short/bug_charseries.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_charseries.stat (modified) (1 diff)
• factory/cf_gcd.cc (modified) (1 diff)

Singular/LIB/primdec.lib

@@ -4006 +4006 @@
   }
   // remaining case: re[n+1] is trivial
-  // either n is at least number of variables or 
+  // either n is at least number of variables or
   // resolution happens to be shorter
   ideal ann=Ann(transpose(re[n]));
@@ -4152 +4152 @@
   matrix m=char_series(PS);  // We compute an irreducible
                              // characteristic series
+  if ((nrows(m)==1)
+  && (ncols(m)==1)
+  && (m[1,1]==1)) // in case of an empty series: min_ass_prim_charsets1
+  {
+    return min_ass_prim_charsets1(PS);
+  }
   int i,j,k;
   list PSI;
@@ -4251 +4257 @@
   matrix m=char_series(PS);  // We compute an irreducible
                              // characteristic series
+                             // this series may be empty (1x1: 1)
   int i,j,k;
+  while ((nrows(m)==1)
+  && (ncols(m)==1)
+  && (m[1,1]==1)) // in case of an empty series: permute the variables
+  {
+    n=string(var(nvars(oldring)));
+    for(i=1;i<nvars(oldring);i++) { n=n+","+string(var(i)); }
+    kill r;
+    execute("ring r=("+charstr(oldring)+"),("+n+"),dp;");
+    ideal PS=imap(oldring,PS);
+    matrix m=char_series(PS);
+  }
   ideal I;
   list PSI;

Tst/Short/bug_charseries.res.gz.uu

@@ -1 @@
-begin 644 bug_charseries.res.gz
-M'XL("%?:;%,``V)U9U]C:&%R<V5R:65S+G)E<P#5E%%OFS`0Q]_S*4[1'@A0
+begin 640 bug_charseries.res.gz
+M'XL(""-R>U,``V)U9U]C:&%R<V5R:65S+G)E<P#5E%%OFS`0Q]_S*4[1'@A0
 MBFU(2".8-&T/E:9-2BI54]5$)#&I-4:H(=K*I]\%!VP13=IK><'<_W>'??>'
 MU</G^V\`0!+X>O\)QG55>[G8CA>CU46A"6!P(PI16Y/%Z'R')('MZ;#9O:2R

Tst/Short/bug_charseries.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1399642710:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:236720
-1 >> tst_memory_1 :: 1399642710:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2338816
-1 >> tst_memory_2 :: 1399642710:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2375480
-1 >> tst_timer_1 :: 1399642710:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:12
+1 >> tst_memory_0 :: 1400599075:4.0.0, 64 bit:4.0.0:x86_64-Linux:nepomuck:272136
+1 >> tst_memory_1 :: 1400599075:4.0.0, 64 bit:4.0.0:x86_64-Linux:nepomuck:2342912
+1 >> tst_memory_2 :: 1400599075:4.0.0, 64 bit:4.0.0:x86_64-Linux:nepomuck:2375984
+1 >> tst_timer_1 :: 1400599075:4.0.0, 64 bit:4.0.0:x86_64-Linux:nepomuck:3

factory/cf_gcd.cc

@@ -958 +958 @@
 content ( const CanonicalForm & f, const Variable & x )
 {
+    if (f.inBaseDomain()) return f;
     ASSERT( x.level() > 0, "cannot calculate content with respect to algebraic variable" );
     Variable y = f.mvar();