Changeset 3068e8 in git

Timestamp:

Sep 4, 2013, 5:33:28 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

96847c7348e137cdf7a7b5a6ae39fb69f9104ed3a009faa5fdde26a448e61937ef0e92779f9a83a6

Parents:

8243aa7b444fb1e2e7a9c62630c681e5d778193c0b8402984cde399f7cfc35b9e16b563913f207e1

Message:

Merge pull request #355 from jankoboehm/spielwiese

Changes/additions to transext.cc

TODO: add tests for all the new features

Files:

• Singular/LIB/ellipticcovers.lib (added)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/table.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)

Singular/iparith.cc

@@ -33 +33 @@
 #include <Singular/mod_lib.h>
 #include <polys/weight.h>
-
+#include <polys/ext_fields/transext.h>
 
 #include <kernel/stairc.h>
@@ -4366 +4366 @@
   }
   res->data = (char *)i;
+  return FALSE;
+}
+static BOOLEAN jjDIFF_COEF(leftv res, leftv u, leftv v)
+{
+  if (!nCoeff_is_transExt(currRing->cf)) 
+  { 
+    WerrorS("differentiation not defined in the coefficient ring");
+    return TRUE;
+  }
+  number n = (number) u->Data();
+  number k = (number) v->Data();
+  res->data = ntDiff(n,k,currRing->cf);
   return FALSE;
 }

Singular/table.h

@@ -522 +522 @@
 ,{D(jjDIFF_ID),   DIFF_CMD,       MODUL_CMD,      MODUL_CMD,  POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjDIFF_ID),   DIFF_CMD,       MATRIX_CMD,     MATRIX_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjDIFF_COEF), DIFF_CMD,       NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjDIM2),      DIM_CMD,        INT_CMD,        IDEAL_CMD,  IDEAL_CMD, ALLOW_PLURAL |NO_RING}
 ,{D(jjDIM2),      DIM_CMD,        INT_CMD,        MODUL_CMD,  IDEAL_CMD, ALLOW_PLURAL |NO_RING}

libpolys/polys/ext_fields/transext.cc

@@ -33 +33 @@
 *           TODO: the description above needs a major update!!!
 */
+
+
+
+
+
 #define TRANSEXT_PRIVATES
 
@@ -67 +72 @@
 #define ADD_COMPLEXITY 1   /**< complexity increase due to + and - */
 #define MULT_COMPLEXITY 2   /**< complexity increase due to * and / */
+#define DIFF_COMPLEXITY 2   /**< complexity increase due to * and / */
 #define BOUND_COMPLEXITY 10   /**< maximum complexity of a number */
 
@@ -740 +746 @@
 */
 }
+
+number ntDiff(number a, number d, const coeffs cf)
+{
+  ntTest(a);
+  ntTest(d);
+
+  fraction t = (fraction) d;
+  if (IS0(d)) 
+  {
+    WerrorS("ringvar expected");
+    return NULL;
+  }
+  if (!DENIS1(t))
+  {
+    WerrorS("expected differentiation by a variable");
+    return a;
+  }
+  int k=p_Var(NUM(t),ntRing);
+  if (k==0)
+  {
+    WerrorS("expected differentiation by a variable");
+    return a;
+  }
+
+  if (IS0(a)) return ntCopy(a, cf);
+
+  fraction fa = (fraction)a;
+  if (DENIS1(fa)) {
+
+     fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+     NUM(result) = p_Diff(NUM(fa),k,ntRing);
+     DEN(result) = NULL;
+     COM(result) = COM(fa);
+     return (number)result;
+  }
+
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  poly fg = p_Mult_q(p_Copy(DEN(fa),ntRing),p_Diff(NUM(fa),k,ntRing),ntRing);
+  poly gf = p_Mult_q(p_Copy(NUM(fa),ntRing),p_Diff(DEN(fa),k,ntRing),ntRing);
+  NUM(result) = p_Sub(fg,gf,ntRing);
+  if (NUM(result)==NULL) return(NULL);
+  DEN(result) = pp_Mult_qq(DEN(fa), DEN(fa), ntRing);
+  COM(result) = COM(fa) + COM(fa) + DIFF_COMPLEXITY;
+  heuristicGcdCancellation((number)result, cf);
+
+  return (number)result;
+}
+
 
 number ntAdd(number a, number b, const coeffs cf)

libpolys/polys/ext_fields/transext.h

@@ -98 +98 @@
 BOOLEAN  ntInitChar(coeffs cf, void* infoStruct);
 
+number ntDiff(number a, number d, const coeffs cf);
+
 /* Private hidden interface
 BOOLEAN  ntGreaterZero(number a, const coeffs cf);