Changeset 3c0710 in git for libpolys


Ignore:
Timestamp:
Nov 14, 2016, 3:14:23 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
59ef0762a78769ee649f91a7c5efbe2f6cca9c3063f46d58a72834b7842693e4f7b37f3a08a1b55b
Parents:
3fec5d04607bb2dbc78498417a5ca31c056e2b82
Message:
4-1-0: sources
Location:
libpolys
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • libpolys/coeffs/AE.cc

    r3fec5d0 r3c0710  
    66#include <math.h>
    77
    8 #ifdef SINGULAR_4_1
     8#ifdef SINGULAR_4_2
    99
    1010using namespace std;

  • libpolys/coeffs/AE.h

    r3fec5d0 r3c0710  
    55#include "si_gmp.h"
    66
    7 #ifdef SINGULAR_4_1
     7#ifdef SINGULAR_4_2
    88
    99class int_poly // Klasse von int_polynomen mit Typ (Grad, Koeffizienten ganzzahlig)

  • libpolys/coeffs/AEQ.cc

    r3fec5d0 r3c0710  
    66#include <stdio.h>
    77#include <math.h>
    8 #ifdef SINGULAR_4_1
     8#ifdef SINGULAR_4_2
    99
    1010using namespace std;

  • libpolys/coeffs/AEQ.h

    r3fec5d0 r3c0710  
    55#include "si_gmp.h"
    66
    7 #ifdef SINGULAR_4_1
     7#ifdef SINGULAR_4_2
    88
    99class Q_poly // Klasse von Q_polynomen mit Typ (Grad, Koeffizienten ganzzahlig)

  • libpolys/coeffs/AEp.cc

    r3fec5d0 r3c0710  
    66#include <stdio.h>
    77#include <math.h>
    8 #ifdef SINGULAR_4_1
     8#ifdef SINGULAR_4_2
    99
    1010

  • libpolys/coeffs/AEp.h

    r3fec5d0 r3c0710  
    55#include "si_gmp.h"
    66
    7 #ifdef SINGULAR_4_1
     7#ifdef SINGULAR_4_2
    88
    99class p_poly // Klasse von p_polynomen mit Typ (Grad, Koeffizienten ganzzahlig)

  • libpolys/coeffs/OPAE.cc

    r3fec5d0 r3c0710  
    2222#include <string.h>
    2323
    24 #ifdef SINGULAR_4_1
     24#ifdef SINGULAR_4_2
    2525
    2626BOOLEAN nAECoeffIsEqual     (number a, number b, const coeffs r);

  • libpolys/coeffs/OPAE.h

    r3fec5d0 r3c0710  
    1010struct snumber; typedef struct snumber *   number;
    1111
    12 #ifdef SINGULAR_4_1
     12#ifdef SINGULAR_4_2
    1313BOOLEAN n_AEInitChar(coeffs , void *);
    1414#endif

  • libpolys/coeffs/OPAEQ.cc

    r3fec5d0 r3c0710  
    99#include <misc/auxiliary.h>
    1010
    11 #ifdef SINGULAR_4_1
     11#ifdef SINGULAR_4_2
    1212
    1313#include <omalloc/omalloc.h>

  • libpolys/coeffs/OPAEQ.h

    r3fec5d0 r3c0710  
    99struct snumber; typedef struct snumber *   number;
    1010
    11 #ifdef SINGULAR_4_1
     11#ifdef SINGULAR_4_2
    1212BOOLEAN n_QAEInitChar(coeffs , void *);
    1313#endif

  • libpolys/coeffs/OPAEp.cc

    r3fec5d0 r3c0710  
    99#include <misc/auxiliary.h>
    1010
    11 #ifdef SINGULAR_4_1
     11#ifdef SINGULAR_4_2
    1212
    1313#include <omalloc/omalloc.h>

  • libpolys/coeffs/OPAEp.h

    r3fec5d0 r3c0710  
    88
    99struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;
    10 struct snumber; typedef struct snumber *   number;
    1110
    12 #ifdef SINGULAR_4_1
     11#ifdef SINGULAR_4_2
    1312BOOLEAN n_pAEInitChar(coeffs , void *);
    1413#endif

  • libpolys/coeffs/flintcf_Q.cc

    r3fec5d0 r3c0710  
    99#include <misc/auxiliary.h>
    1010
    11 #ifdef SINGULAR_4_1
    1211#ifdef HAVE_FLINT
    1312
    … …  
    635634}
    636635#endif
    637 #endif

  • libpolys/coeffs/flintcf_Q.h

    r3fec5d0 r3c0710  
    1111
    1212#include <misc/auxiliary.h>
    13 #ifdef SINGULAR_4_1
    1413#ifdef HAVE_FLINT
    1514BOOLEAN flintQ_InitChar(coeffs cf, void * infoStruct);
    16 #endif
    1715#endif
    1816

  • libpolys/coeffs/flintcf_Zn.cc

    r3fec5d0 r3c0710  
    99#include <misc/auxiliary.h>
    1010
    11 #ifdef SINGULAR_4_1
    1211#ifdef HAVE_FLINT
    1312
    … …  
    543542}
    544543#endif
    545 #endif

  • libpolys/coeffs/flintcf_Zn.h

    r3fec5d0 r3c0710  
    1313#include <misc/auxiliary.h>
    1414
    15 #ifdef SINGULAR_4_1
    1615#ifdef HAVE_FLINT
    1716typedef struct
    … …  
    2221BOOLEAN flintZn_InitChar(coeffs cf, void * infoStruct);
    2322#endif
    24 #endif
    2523
    2624#endif

  • libpolys/coeffs/gnumpfl.cc

    r3fec5d0 r3c0710  
    441441{
    442442  static char ngfCoeffName_buf[27];
    443 #ifdef SINGULAR_4_1
    444   snprintf(ngfCoeffName_buf,27,"real,%d,%d",r->float_len,r->float_len2);
    445 #else
    446443  snprintf(ngfCoeffName_buf,27,"RR(%d,%d)",r->float_len,r->float_len2);
    447 #endif
    448444  return ngfCoeffName_buf;
    449445}

  • libpolys/coeffs/longrat.cc

    r3fec5d0 r3c0710  
    31553155{
    31563156  //return omStrDup(nlCoeffName(r));
    3157 #ifdef SINGULAR_4_1
    31583157  if (r->cfDiv==nlDiv) return omStrDup("QQ");
    31593158  else                 return omStrDup("ZZ");
    3160 #else
    3161   if (r->cfDiv==nlDiv) return omStrDup("0");
    3162   else                 return omStrDup("integer");
    3163 #endif
    31643159}
    31653160

  • libpolys/coeffs/modulop.cc

    r3fec5d0 r3c0710  
    471471{
    472472  static char npCoeffName_buf[15];
    473 #ifdef SINGULAR_4_1
    474473  snprintf(npCoeffName_buf,14,"ZZ/%d",cf->ch);
    475 #else
    476   snprintf(npCoeffName_buf,11,"%d",cf->ch);
    477 #endif
    478474  return npCoeffName_buf;
    479475}

  • libpolys/coeffs/rintegers.cc

    r3fec5d0 r3c0710  
    461461void    nrzCoeffWrite  (const coeffs, BOOLEAN /*details*/)
    462462{
    463 #ifdef SINGULAR_4_1
    464463  PrintS("//   coeff. ring is : ZZ\n");
    465 #else
    466   PrintS("//   coeff. ring is : integer\n");
    467 #endif
    468464}
    469465
    470466static char* nrzCoeffName(const coeffs)
    471467{
    472 #ifdef SINGULAR_4_1
    473468  return (char*)"ZZ";
    474 #else
    475   return (char*)"integer";
    476 #endif
    477469}
    478470

  • libpolys/coeffs/rmodulo2m.cc

    r3fec5d0 r3c0710  
    5252{
    5353  static char n2mCoeffName_buf[22];
    54 #ifdef SINGULAR_4_1
    5554  snprintf(n2mCoeffName_buf,21,"ZZ/(2^%lu)",cf->modExponent);
    56 #else
    57   snprintf(n2mCoeffName_buf,21,"integer,2,%lu",cf->modExponent);
    58 #endif
    5955  return n2mCoeffName_buf;
    6056}
    … …  
    8177  // r->modExponent <=bitsize(long)
    8278  char* s = (char*) omAlloc(11+11);
    83 #ifdef SINGULAR_4_1
    8479  sprintf(s,"ZZ/(2^%lu)",r->modExponent);
    85 #else
    86   sprintf(s,"integer,2,%lu",r->modExponent);
    87 #endif
    8880  return s;
    8981}

  • libpolys/coeffs/rmodulon.cc

    r3fec5d0 r3c0710  
    9898  char* b = (char*) omAlloc(l);
    9999  b= mpz_get_str (b, 10, r->modBase);
    100   #ifdef SINGULAR_4_1
    101100  char* s = (char*) omAlloc(15+l);
    102101  if (nCoeff_is_Ring_ModN(r)) sprintf(s,"ZZ/%s",b);
    103102  else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"ZZ/(bigint(%s)^%lu)",b,r->modExponent);
    104   #else
    105   char* s = (char*) omAlloc(7+2+10+l);
    106   if (nCoeff_is_Ring_ModN(r)) sprintf(s,"integer,%s",b);
    107   else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"integer,%s^%lu",b,r->modExponent);
    108   #endif
    109103  omFreeSize(b,l);
    110104  return s;

  • libpolys/misc/auxiliary.h

    r3fec5d0 r3c0710  
    3636#define SI_BIGINT_VARIANT 1
    3737
    38 /* preparation for versio 4.1.0: cring (4_1), cpoly, cnumber, cmatrix (4_2) */
    39 #undef SINGULAR_4_1
     38/* preparation for versio 4.2.0: cpoly, cnumber, cmatrix (4_2) */
    4039#undef SINGULAR_4_2
    4140

  • libpolys/polys/ext_fields/algext.cc

    r3fec5d0 r3c0710  
    15061506template class IAccessor<snumber*>;
    15071507
    1508 #ifndef SINGULAR_4_1
    1509 BOOLEAN n2pInitChar(coeffs, void *)
    1510 { return 1; }
    1511 #endif
    1512 #ifdef SINGULAR_4_1
    15131508/* --------------------------------------------------------------------*/
    15141509/****************************************
    … …  
    17791774  return FALSE;
    17801775}
    1781 #endif

  • libpolys/polys/flintconv.h

    r3fec5d0 r3c0710  
    2020 * REQUIREMENTS:
    2121 * - agreement about the interface to LLL
    22  * - SINGULAR_4_1
    2322 * - FLINT providing LLL
    2423 * (none of the above is currently true, but all of them is required)
Note: See TracChangeset for help on using the changeset viewer.