Changeset 592906 in git

Timestamp:

Feb 12, 2009, 2:45:23 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

823ff85bb3686ca565d6b9aa91244886d77daa65

Parents:

f349c5396e73ff26cd89cf807a76da5f41d2bd71

Message:

*hannes: format


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

File:

• kernel/ideals.cc (modified) (13 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.67 2009-02-12 13:31:22 motsak Exp $ */
+/* $Id: ideals.cc,v 1.68 2009-02-12 13:45:23 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1315 +1315 @@
   Print("Prepare::h2: ");
   idPrint(h2);
-#endif  
 #endif
-  
+#endif
+
   for (j=0; j<=i; j++)
   {
@@ -1343 +1343 @@
   Print("Prepare::currQuotient: ");
   idPrint(currQuotient);
-#endif  
 #endif
-  
 #endif
 
-  
+#endif
+
+
   h3 = kStd(h2,currQuotient,h,w,NULL,syzcomp);
   idDelete(&h2);
@@ -1564 +1564 @@
   rSetSyzComp(k);
 
-  
+
 #if MYTEST
 #ifdef RDEBUG
   rWrite(syz_ring);
   rDebugPrint(syz_ring);
-#endif  
 #endif
-  
+#endif
+
   ideal s_h1=h1;
 
@@ -1583 +1583 @@
   Print("Input: ");
   idPrint(s_h1);
-#endif  
 #endif
- 
+#endif
+
 
   ideal s_h3=idPrepare(s_h1,h,k,&w);
@@ -1593 +1593 @@
   Print("Prepare: ");
   idPrint(s_h3);
-#endif  
+#endif
 #endif
 
@@ -1602 +1602 @@
   Print("Temp: ");
   idPrint(s_h2);
-#endif  
 #endif
-  
+#endif
+
   if (w!=NULL) delete w;
   i = 0;
@@ -1640 +1640 @@
   Print("Input'': ");
   idPrint(s_h3);
-#endif  
+#endif
 #endif
 
@@ -1650 +1650 @@
   Print("Temp Result: ");
   idPrint(s_h2);
-#endif  
 #endif
-
-  
+#endif
+
+
   if (syz_ring!=orig_ring)
   {
@@ -1698 +1698 @@
   Print("Output Matrix: ");
   iiWriteMatrix(*ma, "ma", 2, 4);
-#endif  
 #endif
-  
+#endif
+
 
   if (syz_ring!=orig_ring) rKill(syz_ring);
@@ -2470 +2470 @@
     wCall(h1->m, sl, x, wNsqr);
     for (sl = pVariables; sl!=0; sl--)
-      wv[1][sl-1] = x[sl + pVariables + 1]; 
+      wv[1][sl-1] = x[sl + pVariables + 1];
     omFreeSize((ADDRESS)x, 2 * (pVariables + 1) * sizeof(int));
 
@@ -4051 +4051 @@
       */
 
-      int cc = gen % m;      
+      int cc = gen % m;
       if( cc == 0) cc = m;
       int vv = 1 + (gen - cc) / m;
@@ -4068 +4068 @@
 
 
-      p_SetExp(h, vv, 1 + p_GetExp(h, vv, rRing) , rRing); // h *= var(j) &&
-      p_SetComp(h, cc, rRing); 
+      p_AddExp(h, vv, 1, rRing); // h *= var(j) &&
+      p_SetComp(h, cc, rRing);
 
       p_Setm(h, rRing);         // addjust degree after the previous steps!