Changeset f3461d in git for dyn_modules

Timestamp:

Feb 28, 2012, 8:11:33 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9b1590d4c8e281abd068646c9d699284f9ea053a

Parents:

986225e4b879695a1828864dc45519cbf8a0f681

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-28 20:11:33+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-05 17:42:53+01:00

Message:

removed componentWeights from IS-ordering

NOTE/TODO: the induced degrees must be implemented separately
(via an extendable variable and module components weight-vector)

File:

• dyn_modules/syzextra/mod_main.cc (modified) (5 diffs)

dyn_modules/syzextra/mod_main.cc

@@ -30 +30 @@
 #include "myNF.h"
 
-extern BOOLEAN rSetISReference(const ring r, const ideal F, const int i, const int p, const intvec * componentWeights);
-
-// extern void rSetISReference(const ideal F, const int rank, const int p, const intvec * componentWeights, const ring r);
 extern void pISUpdateComponents(ideal F, const intvec *const V, const int MIN, const ring r);
 // extern ring rCurrRingAssure_SyzComp();
@@ -504 +501 @@
   const int iLimit = r->typ[pos].data.is.limit;
   const ideal F = r->typ[pos].data.is.F;
-  const intvec* componentWeights = r->typ[pos].data.is.componentWeights;
   ideal FF = id_Copy(F, r);
 
   lists l=(lists)omAllocBin(slists_bin);
-  l->Init(3);
+  l->Init(2);
 
   l->m[0].rtyp = INT_CMD;
@@ -529 +525 @@
   l->m[1].data = reinterpret_cast<void *>(FF);
 
-  l->m[2].rtyp = INTVEC_CMD;
-  
-  if( componentWeights != NULL )
-    l->m[2].data = reinterpret_cast<void *>(new intvec(componentWeights));
-  else
-    l->m[2].data = reinterpret_cast<void *>(new intvec());
-    
-
-
   res->rtyp = LIST_CMD; // list of int/module
   res->data = reinterpret_cast<void *>(l);
@@ -558 +545 @@
     return TRUE;
   }
-
-  intvec * componentWeights = (intvec *)atGet(h,"isHomog",INTVEC_CMD); // No copy!
 
   const ideal F = (ideal)h->Data(); ; // No copy!
@@ -592 +577 @@
 
   // F & componentWeights belong to that ordering block of currRing now:
-  rSetISReference(r, F, rank, p, componentWeights); // F and componentWeights will be copied!
+  rSetISReference(r, F, rank, p); // F will be copied!
   return FALSE;
 }