Changeset 6b8433 in git

Timestamp:

Dec 8, 2008, 3:24:41 PM (15 years ago)

Author:

Alexander Dreyer <dreyer@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a6b576a7994def0a72d9623eed6bc45b7074c746

Parents:

18ef40f42eafb26bcadfdbf8f8f70a8a0de137d6

Message:

+ Fix for Trac#42 by anne


git-svn-id: file:///usr/local/Singular/svn/trunk@11218 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/classify.lib (modified) (6 diffs)

Singular/LIB/classify.lib

@@ -1 +1 @@
 // KK,GMG last modified: 17.12.00
 ///////////////////////////////////////////////////////////////////////////////
-version  = "$Id: classify.lib,v 1.53 2006-07-31 09:11:10 Singular Exp $";
+version  = "$Id: classify.lib,v 1.54 2008-12-08 14:24:41 dreyer Exp $";
 category="Singularities";
 info="
@@ -96 +96 @@
 
   v = Klassifiziere(conv_ext2top(f_in));
-  poly f_out = v[1];
-  s2 = v[2];          // s2: Typ des Polynoms f z.b: E[18]
-  corank = v[3];
+  if(typeof(v[1])=="poly") {
+     poly f_out = v[1];
+     s2 = v[2];          // s2: Typ des Polynoms f z.b: E[18]
+     corank = v[3];
+  }
+  else {
+     s2="NoClass";
+  }
 
 //---------------- collect results and create return-value --------------------
@@ -261 +266 @@
     }
 //-------------------------- classification done ------------------------------
+    if(typeof(v_class[1])!="poly") {
+       return(v);
+    }
     poly f_result = v_class[1];
     v[2] = v_class[2];
@@ -532 +540 @@
         if(Dim==1) {
            return(printresult(32, f,
-                  "W#["+string(k)+","+string(Mu-12*k-2)+"]", cstn, 3*k-1));
+                  "W#["+string(k)+","+string(Mu-12*k-3)+"]", cstn, 3*k-1));
         }
         return(printresult(29, f, "error!", cstn, -1));
@@ -1461 +1469 @@
   int Mu = cstn[2];
   int K  = cstn[3];
-  string s = "The Singularity ";+Show(jet(f, K), corank, K);
+  string s = "The Singularity "+Show(jet(f, K));
   string tp="";
 //  return(printresult(47, f, tp, cstn, -1));
 
   s = s +" has 4-jet equal to zero. (F47), mu="+string(Mu);
-
+  
   s; // +"  ("+SG_Typ+")";
+  s = "No further classification available.";
+  s;
   return(Show(f), tp, corank);
 }
@@ -2212 +2222 @@
   list v;
 
-  if(sg[1]==1 && sg[2]==0 && sg[3]==1) { v=HKclass7_teil_1(sg, SG_Typ, cnt); }
+  if(sg[1]==1 && sg[2]==0 && sg[3]==1) { 
+      v=HKclass7_teil_1(sg, SG_Typ, cnt); 
+  }
+  else {
+      v[1]="not in list";
+      v[2]=0;
+  }
   debug_log(6, "HKclass7: ", v[1], " cnt=", v[2]);
   return(v);