Changeset 0af505 in git

Timestamp:

Dec 19, 2012, 4:29:13 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

ce0455b56042df7493ea3bb90650feacef0f4d39

Parents:

ef52d678e5a63401bb75f33e6efb86b084c667f17f7f235325ba7a08661f52ffc70d751031b8ab21

Message:

Merge pull request #246 from mmklee/sw_fix

fix: printing in ivOptimizeKern if option(prot)

TODO: write new tests that would indicate the change in global and ring options wrt master!

Location:

libpolys

Files:

• misc/intvec.cc (modified) (2 diffs)
• polys/monomials/ring.cc (modified) (1 diff)

libpolys/misc/intvec.cc

@@ -13 +13 @@
 // #include <findexec/feFopen.h>
 #include <misc/intvec.h>
+#include <misc/options.h>
 #include <omalloc/omalloc.h>
 
@@ -656 +657 @@
   intvec *res=new intvec(c);
 
-  //if (TEST_OPT_PROT)
-  //  Warn(" %d linear independent solutions\n",r);
+  if (TEST_OPT_PROT)
+    Warn(" %d linear independent solutions\n",r);
   for (i=r;i>1;i--)
   {

libpolys/polys/monomials/ring.cc

@@ -3832 +3832 @@
   r->p_Procs = (p_Procs_s*)omAlloc(sizeof(p_Procs_s));
   p_ProcsSet(r, r->p_Procs);
-  p_SetGlobals(r);
   return FALSE;
 }