Changeset c7ae4d in git for Singular/number2.h

Timestamp:

Aug 31, 2016, 12:30:31 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e180f5613c396d33aa3316cd450d3a1e80d69129

Parents:

7e2307f3485ab92e550254c1212dafc2940b41ea

Message:

Singular_4_1: parent(..)

File:

• Singular/number2.h (modified) (4 diffs)

Singular/number2.h

@@ -9 +9 @@
 #include <kernel/structs.h>
 struct snumber2;
+struct spoly2;
 typedef struct snumber2 *   number2;
+typedef struct spoly2 *     poly2;
 struct snumber2
 { coeffs cf;
@@ -15 +17 @@
 };
 
+struct spoly2
+{ ring cf;
+  poly n;
+};
+
 static inline number2 n2Init(long i, coeffs c)
 { number2 N=(number2)omAlloc0(sizeof(snumber2)); if (c!=NULL) { N->cf=c; N->n=n_Init(i,c);} return N;}
+
+static inline poly2 p2Init(long i, ring c)
+{ poly2 N=(poly2)omAlloc0(sizeof(spoly2)); if (c!=NULL) { N->cf=c; N->n=p_ISet(i,c);} return N;}
 
 char *crString(coeffs c);
@@ -31 +41 @@
 BOOLEAN jjN2_CR(leftv res, leftv a);              // number2 ->cring
 BOOLEAN jjCM_CR(leftv res, leftv a);              // cmatrix ->cring
-BOOLEAN jjBIM2_CR(leftv res, leftv a);              // bigint ->cring
+BOOLEAN jjBIM2_CR(leftv res, leftv a);            // bigint ->cring
 BOOLEAN jjR2_CR(leftv res, leftv a);              // ring ->cring
-BOOLEAN jjN2_N(leftv res, leftv a);             // number2 ->number
-
+BOOLEAN jjN2_N(leftv res, leftv a);               // number2 ->number
+BOOLEAN jjP2_R(leftv res, leftv a);              // poly2 ->ring
 // operations:
 BOOLEAN jjNUMBER2_OP1(leftv res, leftv a);
 BOOLEAN jjNUMBER2_OP2(leftv res, leftv a, leftv b);
+BOOLEAN jjNUMBER2_POW(leftv res, leftv a, leftv b);
+BOOLEAN jjPOLY2_OP1(leftv res, leftv a);
+BOOLEAN jjPOLY2_OP2(leftv res, leftv a, leftv b);
+BOOLEAN jjPOLY2_POW(leftv res, leftv a, leftv b);
 
 number2 n2Copy(const number2 d);
@@ -44 +58 @@
 void n2Print(number2 d);
 
+poly2 p2Copy(const poly2 d);
+void p2Delete(poly2 &d);
+char *p2String(poly2 d, BOOLEAN typed);
+void p2Print(poly2 d);
+
 BOOLEAN jjCMATRIX_3(leftv, leftv, leftv,leftv);
 #endif