Changeset d3981f in git for kernel/sca.cc

Timestamp:

Mar 2, 2007, 3:26:54 PM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

cbc372f1d6bba1dc057875ed3c0faeac5d926e88

Parents:

68fcc8f5fe5f537b6dd4c6bc7e14f5987b81c31c

Message:

*motsak: fixed rank for ideal square killer. warning elimination.


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

File:

• kernel/sca.cc (modified) (17 diffs)

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.10 2007-02-23 14:41:43 motsak Exp $
+ *  Version: $Id: sca.cc,v 1.11 2007-03-02 14:26:54 motsak Exp $
  *******************************************************************/
 
@@ -384 +384 @@
       if(iComponentMonomM==0 )
       {
-        Print("Multiplication in the left module from the right");
+        WarnS("Multiplication in the left module from the right");
       }
 #endif
@@ -466 +466 @@
       if(iComponentMonomM==0 )
       {
-        Print("Multiplication in the left module from the right");
+        WarnS("Multiplication in the left module from the right");
       }
 #endif
@@ -576 +576 @@
       if(iComponent==0 )
       {
-        Print("Multiplication in the left module from the right");
+        WarnS("Multiplication in the left module from the right");
       }
 #endif
@@ -649 +649 @@
       if(iComponent==0 )
       {
-        Print("Multiplication in the left module from the right");
+        WarnS("Multiplication in the left module from the right");
       }
 #endif
@@ -959 +959 @@
 }
 
+#ifndef NDEBUG
+
+// set it here if needed.
+#define MYTEST 0
+
+#else
+
+#define MYTEST 0
+
+#endif
+
+
 
 ideal sca_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat)
 {
+#if MYTEST
+   PrintS("<sca_gr_bba>\n");
+#endif 
+
   assume(rIsSCA(currRing));
+
+#ifndef NDEBUG
+  idTest(F);
+  idTest(Q);  
+#endif
 
   const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
@@ -976 +997 @@
   strat->homog = strat->homog && bIdHomog;
 
-#ifdef PDEBUG
+
   assume( strat->homog == bIdHomog );
-#endif /*PDEBUG*/
-
-
-#if 0
-   PrintS("<sca::bba>\n");
+
+
+#if MYTEST
+/*
   {
     Print("ideal F: \n");
-    for (int i = 0; i < tempF->idelems(); i++)
-    {
-      Print("; F[%d] = ", i+1);
-      p_Write(tempF->m[i], currRing);
-    }
-    Print(";\n");
-    PrintLn();
-  }
-#endif
-
-
-#ifdef PDEBUG
-//   PrintS("sca_gr_bba\n");
-#endif /*PDEBUG*/
+    idPrint(F);
+    Print("ideal tempF: \n");
+    idPrint(F);
+  }
+*/
+#endif
+
+
 
 
@@ -1005 +1019 @@
   int olddeg, reduc;
   int red_result = 1;
-  int hilbeledeg = 1, hilbcount = 0, minimcnt = 0;
+//  int hilbeledeg = 1, minimcnt = 0;
+  int hilbcount = 0;
 
   initBuchMoraCrit(strat); // set Gebauer, honey, sugarCrit
@@ -1203 +1218 @@
 
 
-#if 0
-   PrintS("</sca::bba>\n");
+#if MYTEST
+   PrintS("</sca_gr_bba>\n");
 #endif
 
@@ -1397 +1412 @@
 {
   assume(1 <= i);
-  assume(i <= rRing->N);
+  assume(i <= (unsigned int)rRing->N);
 
   if(rIsSCA(rRing))
@@ -1422 +1437 @@
 
 // Under development!!!
-ideal sca_bba (const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat)
+ideal sca_bba (const ideal F, const ideal Q, const intvec *w, const intvec * /*hilb*/, kStrategy strat)
 {
   assume(rIsSCA(currRing));
@@ -1448 +1463 @@
   int   srmax, lrmax, red_result = 1;
   int   olddeg, reduc;
-  int hilbeledeg=1, hilbcount=0, minimcnt=0;
+
+//  int hilbeledeg = 1, minimcnt = 0;
+  int hilbcount = 0;
 
   BOOLEAN withT = FALSE;
@@ -1867 +1884 @@
   int reduc = 0;
   int red_result = 1;
-  int hilbeledeg=1,hilbcount=0;
+//  int hilbeledeg=1;
+  int hilbcount=0;
 
   strat->update = TRUE;
@@ -2195 +2213 @@
   assume( wy->cols() == 1 );
 
-  assume( wx->rows() >= N );
-  assume( wy->rows() >= N );
+  assume( (unsigned int)wx->rows() >= N );
+  assume( (unsigned int)wy->rows() >= N );
 
   int x = 0;
@@ -2356 +2374 @@
   assume( m != NULL );
 
-  for(int k = iFirstAltVar; k <= iLastAltVar; k++)
+  for(unsigned int k = iFirstAltVar; k <= iLastAltVar; k++)
     if( p_GetExp(m, k, r) > 1 )
       return NULL;  
@@ -2428 +2446 @@
   if (iSize == 0) return id;
  
-  ideal temp = idInit(iSize, 1);
+  ideal temp = idInit(iSize, id->rank);
   
 #if 0
@@ -2465 +2483 @@
 #endif
 
+//  temp->rank = idRankFreeModule(temp, r);
+
   return temp;
 }