Changeset 0bfec5 in git

Timestamp:

May 28, 2013, 3:49:12 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

fa15984ec25c611c06dd0ecc031ba4b26112e0e8

Parents:

6d67eb95fd2c6cbc9667de6f9a7319600844b2fb

Message:

add: univariate dense algebraic extensions

Files:

• Singular/extra.cc (modified) (2 diffs)
• libpolys/coeffs/AE.cc (added)
• libpolys/coeffs/AE.h (added)
• libpolys/coeffs/AEQ.cc (added)
• libpolys/coeffs/AEQ.h (added)
• libpolys/coeffs/AEp.cc (added)
• libpolys/coeffs/AEp.h (added)
• libpolys/coeffs/Makefile.am (modified) (2 diffs)
• libpolys/coeffs/OPAE.cc (added)
• libpolys/coeffs/OPAE.h (added)
• libpolys/coeffs/OPAEQ.cc (added)
• libpolys/coeffs/OPAEQ.h (added)
• libpolys/coeffs/OPAEp.cc (added)
• libpolys/coeffs/OPAEp.h (added)
• libpolys/coeffs/OPAPQ.cc (added)
• libpolys/coeffs/numbers.cc (modified) (1 diff)
• libpolys/coeffs/rmodulon.cc (modified) (2 diffs)

Singular/extra.cc

@@ -49 +49 @@
 #include <coeffs/coeffs.h>
 #include <coeffs/mpr_complex.h>
+#include "coeffs/AE.h"
+#include "coeffs/OPAE.h"
+#include "coeffs/AEp.h"
+#include "coeffs/OPAEp.h"
+#include "coeffs/AEQ.h"
+#include "coeffs/OPAEQ.h"
+
 
 #include <polys/monomials/ring.h>
@@ -3814 +3821 @@
   }
   else
+  /*==================== Test Boos Epure ==================================*/
+  if (strcmp(sys_cmd, "Hallo")==0)
+  {
+    n_coeffType nae=nRegister(n_unknown,n_AEInitChar);
+    coeffs AE=nInitChar(nae,NULL);
+    ring r=currRing;
+    rUnComplete(r);
+    r->cf=AE;
+    rComplete(r,TRUE);
+    /*
+    // Ab hier wird gespielt
+    int_poly* f=new int_poly;
+    f->poly_insert();
+    int_poly* g=new int_poly;
+    g->poly_insert();
+    // Ab hier gerechnet
+    number a=reinterpret_cast<number> (f);
+    number b=reinterpret_cast<number> (g);
+    number erg=n_Gcd(a,b,AE);
+    int_poly* h= reinterpret_cast<int_poly*> (erg);
+    h->poly_print();
+*/
+    return FALSE;
+  }
+  else
+  /*==================== Test Boos Epure 2 ==================================*/
+  if (strcmp(sys_cmd, "Hallo2")==0)
+  {
+    n_coeffType naeq=nRegister(n_unknown,n_QAEInitChar);
+    coeffs AEQ=nInitChar(naeq,NULL);
+    ring r=currRing;
+    rUnComplete(r);
+    r->cf=AEQ;
+    rComplete(r,TRUE);
+
+    return FALSE;
+  }
+  else
+  /*==================== Test Boos Epure 3==================================*/
+  if (strcmp(sys_cmd, "Hallo3")==0)
+  {
+    n_coeffType naep=nRegister(n_unknown,n_pAEInitChar);
+    coeffs AEp=nInitChar(naep,NULL);
+    ring r=currRing;
+    rUnComplete(r);
+    r->cf=AEp;
+    rComplete(r,TRUE);
+    //JETZT WOLLEN WIR DOCH MAL SPIELEN
+
+    // Ab hier wird gespielt
+    p_poly* f=new p_poly;
+    f->p_poly_insert();
+
+    p_poly* g=new p_poly;
+    g->p_poly_insert();
+    // Ab hier gerechnet
+    number a=reinterpret_cast<number> (f);
+    number b=reinterpret_cast<number> (g);
+    number erg=n_Add(a,b,AEp);
+    p_poly* h= reinterpret_cast<p_poly*> (erg);
+    h->p_poly_print();
+   
+    return FALSE;
+  }
+  else
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

libpolys/coeffs/Makefile.am

@@ -40 +40 @@
         gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
         modulop.cc mpr_complex.cc \
-  bigintmat.cc 
+  bigintmat.cc  AE.cc OPAE.cc AEp.cc OPAEp.cc AEQ.cc OPAEQ.cc
 
 libcoeffs_la_SOURCES   = $(SOURCES)
@@ -47 +47 @@
 libcoeffs_includedir  =$(includedir)/singular/coeffs
 libcoeffs_include_HEADERS = coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h shortfl.h mpr_complex.h mpr_global.h \
-  bigintmat.h Enumerator.h
+  bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
 
 

libpolys/coeffs/numbers.cc

@@ -339 +339 @@
     n->cfMPZ = ndMPZ;
 
-    //n->cfKillChar = ndKillChar; /* dummy */
+    // n->cfKillChar = ndKillChar; /* dummy */
     n->cfSetChar = ndSetChar; /* dummy */
     // temp. removed to catch all the coeffs which miss to implement this!

libpolys/coeffs/rmodulon.cc

@@ -83 +83 @@
   r->cfIsMOne      = nrnIsMOne;
   r->cfGreaterZero = nrnGreaterZero;
-  r->cfWriteLong       = nrnWrite;
+  r->cfWriteLong   = nrnWrite;
   r->cfRead        = nrnRead;
   r->cfPower       = nrnPower;
@@ -97 +97 @@
   r->nCoeffIsEqual = nrnCoeffsEqual;
   r->cfInit_bigint = nrnMapQ;
-
+  r->cfKillChar    = ndKillChar;
 #ifdef LDEBUG
   r->cfDBTest      = nrnDBTest;