Changeset 15ff9a in git

Timestamp:

Aug 12, 2011, 5:44:15 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

c10515350d72537c759f372977e1d69188eed976

Parents:

6cc7f5d54a92bff33c3baf595af86929d31cd9d3

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 17:44:15+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:24:02+01:00

Message:

add missing header:  Singular/linearAlgebra_ip.h

Files:

• Singular/iparith.cc (modified) (7 diffs)
• Singular/ipshell.h (modified) (1 diff)
• Singular/linearAlgebra_ip.h (added)
• kernel/mod2.h (modified) (1 diff)

Singular/iparith.cc

@@ -60 +60 @@
 #include <kernel/linearAlgebra.h>
 #include <Singular/misc_ip.h>
+#include <Singular/linearAlgebra_ip.h>
 #ifdef HAVE_FACTORY
 #  include <polys/clapsing.h>
@@ -85 +86 @@
 #ifdef HAVE_PLURAL
   #include <kernel/ratgring.h>
+  #include <kernel/nc.h>
+  #include <polys/nc/nc.h>
   #include <polys/nc/sca.h>
   #define ALLOW_PLURAL     1
@@ -216 +219 @@
 
 int iiOp; /* the current operation*/
+
+/*=================== simple helpers =================*/
+poly pHeadProc(poly p)
+{
+  return pHead(p);
+} 
 
 /*=================== operations with 2 args.: static proc =================*/
@@ -5047 +5056 @@
 static BOOLEAN jjmpTrace(leftv res, leftv v)
 {
-  res->data = (char *)mpTrace((matrix)v->Data());
+  res->data = (char *)mp_Trace((matrix)v->Data(),currRing);
   return FALSE;
 }
 static BOOLEAN jjmpTransp(leftv res, leftv v)
 {
-  res->data = (char *)mpTransp((matrix)v->Data());
+  res->data = (char *)mp_Transp((matrix)v->Data(),currRing);
   return FALSE;
 }
@@ -5101 +5110 @@
 #define jjsyMinBase    (proc1)syMinBase
 #define jjpMaxComp     (proc1)pMaxCompProc
-#define jjmpTrace      (proc1)mpTrace
-#define jjmpTransp     (proc1)mpTransp
 #define jjrOrdStr      (proc1)rOrdStr
 #define jjrVarStr      (proc1)rVarStr
@@ -5399 +5406 @@
   BOOLEAN r=jjCOEFFS_Id(res,u,v);
   if (r) return TRUE;
-  mpMonomials((matrix)res->data, rank, pVar((poly)v->Data()),(matrix)w->Data());
+  mp_Monomials((matrix)res->data, rank, pVar((poly)v->Data()),(matrix)w->Data(),currRing);
   return FALSE;
 }
@@ -5432 +5439 @@
   t.CleanUp();
   if (r) return TRUE;
-  mpMonomials((matrix)res->data, rank, pVar((poly)v->Data()),(matrix)w->Data());
+  mp_Monomials((matrix)res->data, rank, pVar((poly)v->Data()),(matrix)w->Data(),currRing);
   return FALSE;
 }

Singular/ipshell.h

@@ -212 +212 @@
 lists scIndIndset(ideal S, BOOLEAN all, ideal Q);
 BOOLEAN mpKoszul(leftv res,leftv c/*ip*/, leftv b/*in*/, leftv id);
-
-#endif
-
+BOOLEAN mpJacobi(leftv res,leftv a);
+BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w);
+BOOLEAN kQHWeight(leftv res,leftv v);
+BOOLEAN kWeight(leftv res,leftv id);
+BOOLEAN loSimplex( leftv res, leftv args );
+BOOLEAN loNewtonP( leftv res, leftv arg1 );
+
+
+#endif
+

kernel/mod2.h

@@ -28 +28 @@
 #define TIME_WITH_SYS_TIME 1
 #define HAVE_SYS_TIME_H 1
+#define PROC_BUG 1
 /* Default value for timer resolution in ticks per second */
 /* set to 10 for resolution of tenth of a second, etc */