Changeset 499ab0 in git

Timestamp:

Oct 8, 2004, 8:16:31 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

22c0e6e2df6d5097c4861139e20b6f8b8ba7e6e0

Parents:

2411cb4b5f99b433d306e20603f800cc61d69fe0

Message:

*bricken: minimal basis output


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

File:

• Singular/tgb.cc (modified) (3 diffs)

Singular/tgb.cc

@@ -3539 +3539 @@
     }
   }
+  Print("is homog:%d",c->is_homog);
   void* h;
   poly hp;
@@ -3719 +3720 @@
   }
   int deleted_form_c_s=0;
-
-  for(i=0;i<c->n;i++){
-    if (c->rep[i]!=i){
-      for(j=0;j<=c->strat->sl;j++){
-        if(c->strat->S[j]==c->S->m[i]){
-          c->strat->S[j]=NULL;
-          break;
-        }
-      }
-//      PrintS("R_delete");
-      pDelete(&c->S->m[i]);
-    }
-  }
+  
   for(i=0;i<=c->strat->sl;i++){
     if (!c->strat->S[i]) continue;
@@ -3742 +3731 @@
     }
     if(!found) pDelete(&c->strat->S[i]);
+  }
+//   for(i=0;i<c->n;i++){
+//     if (c->rep[i]!=i){
+// //       for(j=0;j<=c->strat->sl;j++){
+// //   if(c->strat->S[j]==c->S->m[i]){
+// //     c->strat->S[j]=NULL;
+// //     break;
+// //   }
+// //       }
+// //      PrintS("R_delete");
+//       pDelete(&c->S->m[i]);
+//     }
+//   }
+
+//  qsort(c->S->m, c->n,sizeof(poly),pLmCmp_func);
+  for(i=0;i<c->n;i++)
+  {
+    assume(c->S->m[i]!=NULL);
+    for(j=0;j<c->n;j++)
+    {
+      if((c->S->m[j]==NULL)||(i==j)) 
+        continue;
+      assume(p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
+                               c->S->m[i],~c->short_Exps[i],
+                                   c->r)==p_LmDivisibleBy(c->S->m[j],
+                                                        c->S->m[i],
+                                                          c->r));
+      if (p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
+                               c->S->m[i],~c->short_Exps[i],
+                                   c->r))
+      {
+        pDelete(&c->S->m[i]);
+        break;
+      }
+    }
   }
   omfree(c->rep);