Changeset 0bfec5 in git


Ignore:
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:
13 added
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    r6d67eb9 r0bfec5  
    4949#include <coeffs/coeffs.h>
    5050#include <coeffs/mpr_complex.h>
     51#include "coeffs/AE.h"
     52#include "coeffs/OPAE.h"
     53#include "coeffs/AEp.h"
     54#include "coeffs/OPAEp.h"
     55#include "coeffs/AEQ.h"
     56#include "coeffs/OPAEQ.h"
     57
    5158
    5259#include <polys/monomials/ring.h>
     
    38143821  }
    38153822  else
     3823  /*==================== Test Boos Epure ==================================*/
     3824  if (strcmp(sys_cmd, "Hallo")==0)
     3825  {
     3826    n_coeffType nae=nRegister(n_unknown,n_AEInitChar);
     3827    coeffs AE=nInitChar(nae,NULL);
     3828    ring r=currRing;
     3829    rUnComplete(r);
     3830    r->cf=AE;
     3831    rComplete(r,TRUE);
     3832    /*
     3833    // Ab hier wird gespielt
     3834    int_poly* f=new int_poly;
     3835    f->poly_insert();
     3836    int_poly* g=new int_poly;
     3837    g->poly_insert();
     3838    // Ab hier gerechnet
     3839    number a=reinterpret_cast<number> (f);
     3840    number b=reinterpret_cast<number> (g);
     3841    number erg=n_Gcd(a,b,AE);
     3842    int_poly* h= reinterpret_cast<int_poly*> (erg);
     3843    h->poly_print();
     3844*/
     3845    return FALSE;
     3846  }
     3847  else
     3848  /*==================== Test Boos Epure 2 ==================================*/
     3849  if (strcmp(sys_cmd, "Hallo2")==0)
     3850  {
     3851    n_coeffType naeq=nRegister(n_unknown,n_QAEInitChar);
     3852    coeffs AEQ=nInitChar(naeq,NULL);
     3853    ring r=currRing;
     3854    rUnComplete(r);
     3855    r->cf=AEQ;
     3856    rComplete(r,TRUE);
     3857
     3858    return FALSE;
     3859  }
     3860  else
     3861  /*==================== Test Boos Epure 3==================================*/
     3862  if (strcmp(sys_cmd, "Hallo3")==0)
     3863  {
     3864    n_coeffType naep=nRegister(n_unknown,n_pAEInitChar);
     3865    coeffs AEp=nInitChar(naep,NULL);
     3866    ring r=currRing;
     3867    rUnComplete(r);
     3868    r->cf=AEp;
     3869    rComplete(r,TRUE);
     3870    //JETZT WOLLEN WIR DOCH MAL SPIELEN
     3871
     3872    // Ab hier wird gespielt
     3873    p_poly* f=new p_poly;
     3874    f->p_poly_insert();
     3875
     3876    p_poly* g=new p_poly;
     3877    g->p_poly_insert();
     3878    // Ab hier gerechnet
     3879    number a=reinterpret_cast<number> (f);
     3880    number b=reinterpret_cast<number> (g);
     3881    number erg=n_Add(a,b,AEp);
     3882    p_poly* h= reinterpret_cast<p_poly*> (erg);
     3883    h->p_poly_print();
     3884   
     3885    return FALSE;
     3886  }
     3887  else
    38163888/*==================== Error =================*/
    38173889      Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );
  • libpolys/coeffs/Makefile.am

    r6d67eb9 r0bfec5  
    4040        gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
    4141        modulop.cc mpr_complex.cc \
    42   bigintmat.cc
     42  bigintmat.cc  AE.cc OPAE.cc AEp.cc OPAEp.cc AEQ.cc OPAEQ.cc
    4343
    4444libcoeffs_la_SOURCES   = $(SOURCES)
     
    4747libcoeffs_includedir  =$(includedir)/singular/coeffs
    4848libcoeffs_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 \
    49   bigintmat.h Enumerator.h
     49  bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
    5050
    5151
  • libpolys/coeffs/numbers.cc

    r6d67eb9 r0bfec5  
    339339    n->cfMPZ = ndMPZ;
    340340
    341     //n->cfKillChar = ndKillChar; /* dummy */
     341    // n->cfKillChar = ndKillChar; /* dummy */
    342342    n->cfSetChar = ndSetChar; /* dummy */
    343343    // temp. removed to catch all the coeffs which miss to implement this!
  • libpolys/coeffs/rmodulon.cc

    r6d67eb9 r0bfec5  
    8383  r->cfIsMOne      = nrnIsMOne;
    8484  r->cfGreaterZero = nrnGreaterZero;
    85   r->cfWriteLong       = nrnWrite;
     85  r->cfWriteLong   = nrnWrite;
    8686  r->cfRead        = nrnRead;
    8787  r->cfPower       = nrnPower;
     
    9797  r->nCoeffIsEqual = nrnCoeffsEqual;
    9898  r->cfInit_bigint = nrnMapQ;
    99 
     99  r->cfKillChar    = ndKillChar;
    100100#ifdef LDEBUG
    101101  r->cfDBTest      = nrnDBTest;
Note: See TracChangeset for help on using the changeset viewer.