Changeset 599813 in git

Timestamp:

May 23, 2012, 5:42:26 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

70a95295f71d2f0c4c3433b152aef7a25b43e520

Parents:

a28cb4f3357225d7f8bb8d68a4aa0b0be3ccdd41

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-05-23 17:42:26+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-05-23 20:33:48+02:00

Message:

minor changes/improvements

add: default return value for a missing/wrong attribute of an idhdl object (atGet)
chg: minor cleanup in p_Setm_General
add: output of NegWeightL_* in rDebugPrint
add: some doxygen docs to pGetCoeff
add: more (internal) debug output on the ring/exponent structure: VarL_LowIndex, VarL_Offset
add: doxygen description to id_Sort

Files:

• Singular/attrib.cc (modified) (2 diffs)
• Singular/attrib.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)
• libpolys/polys/simpleideals.cc (modified) (2 diffs)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/attrib.cc

@@ -128 +128 @@
 }
 
-void * atGet(idhdl root,const char * name, int t)
+void * atGet(idhdl root,const char * name, int t, void *defaultReturnValue)
 {
   attr temp = root->attribute->get(name);
@@ -134 +134 @@
     return temp->data;
   else
-    return NULL;
+    return defaultReturnValue;
 }
 

Singular/attrib.h

@@ -34 +34 @@
 void * atGet(idhdl root,const char * name);
 void * atGet(leftv root,const char * name);
-void * atGet(idhdl root,const char * name, int t);
+void * atGet(idhdl root,const char * name, int t, void *defaultReturnValue = NULL);
 void * atGet(leftv root,const char * name, int t);
 void atSet(idhdl root,const char * name,void * data,int typ);

libpolys/polys/monomials/p_polys.cc

@@ -148 +148 @@
           if ((c > 0) && (c <= len_gen))
           {
-            const int * const wm = o->data.am.weights_m;
-            assume( wm[0] == len_gen );
-            ord += wm[c];
+            assume( w == o->data.am.weights_m );
+            assume( w[0] == len_gen );
+            ord += w[c];
           }
           

libpolys/polys/monomials/p_polys.h

@@ -48 +48 @@
 // coeff
 // #define pGetCoeff(p)        ((p)->coef)
+/// return an alias to the leading coefficient of p
+/// assumes that p != NULL
+/// NOTE: not copy
 static inline number& pGetCoeff(poly p)
 {

libpolys/polys/monomials/ring.cc

@@ -4033 +4033 @@
   Print("VarL_Size:%d\n",r->VarL_Size);
   Print("bitmask=0x%lx (expbound=%ld) \n",r->bitmask, r->bitmask);
+  Print("divmask=%lx\n", r->divmask);
   Print("BitsPerExp=%d ExpPerLong=%d MinExpPerLong=%d at L[%d]\n", r->BitsPerExp, r->ExpPerLong, r->MinExpPerLong, r->VarL_Offset[0]);
-  PrintS("varoffset:\n");
+
+  Print("VarL_LowIndex: %d\n", r->VarL_LowIndex);
+  PrintS("VarL_Offset:\n");
+  if (r->VarL_Offset==NULL) PrintS(" NULL");
+  else
+    for(j = 0; j < r->VarL_Size; j++)
+      Print("  VarL_Offset[%d]: %d ", j, r->VarL_Offset[j]);
+  PrintLn();
+      
+
+  PrintS("VarOffset:\n");
   if (r->VarOffset==NULL) PrintS(" NULL\n");
   else
@@ -4040 +4051 @@
       Print("  v%d at e-pos %d, bit %d\n",
             j,r->VarOffset[j] & 0xffffff, r->VarOffset[j] >>24);
-  Print("divmask=%lx\n", r->divmask);
   PrintS("ordsgn:\n");
   for(j=0;j<r->CmpL_Size;j++)
@@ -4164 +4174 @@
   }
   Print("LexOrder:%d, MixedOrder:%d\n",r->LexOrder, r->MixedOrder);
+
+  Print("NegWeightL_Size: %d, NegWeightL_Offset: ", r->NegWeightL_Size);
+  if (r->NegWeightL_Offset==NULL) PrintS(" NULL");
+  else
+    for(j = 0; j < r->NegWeightL_Size; j++)
+      Print("  [%d]: %d ", j, r->NegWeightL_Offset[j]);
+  PrintLn();
 
   // p_Procs stuff

libpolys/polys/simpleideals.cc

@@ -434 +434 @@
 #endif
 
-/*3
-* for idSort: compare a and b revlex inclusive module comp.
-*/
+///3 for idSort: compare a and b revlex inclusive module comp.
 static int p_Comp_RevLex(poly a, poly b,BOOLEAN nolex, const ring R)
 {
@@ -469 +467 @@
 }
 
-/*2
-*sorts the ideal w.r.t. the actual ringordering
-*uses lex-ordering when nolex = FALSE
-*/
-intvec *id_Sort(ideal id,BOOLEAN nolex, const ring r)
+// sorts the ideal w.r.t. the actual ringordering
+// uses lex-ordering when nolex = FALSE
+intvec *id_Sort(const ideal id, const BOOLEAN nolex, const ring r)
 {
   intvec * result = new intvec(IDELEMS(id));

libpolys/polys/simpleideals.h

@@ -101 +101 @@
 void id_DelDiv(ideal id, const ring r);
 BOOLEAN id_IsConstant(ideal id, const ring r);
-intvec *id_Sort(ideal id,BOOLEAN nolex, const ring r);
+
+/// sorts the ideal w.r.t. the actual ringordering
+/// uses lex-ordering when nolex = FALSE
+intvec *id_Sort(const ideal id, const BOOLEAN nolex, const ring r);
+
 ideal id_Transp(ideal a, const ring rRing);
 void id_Compactify(ideal id, const ring r);