Changeset 7203f7 in git


Ignore:
Timestamp:
Apr 16, 2015, 4:51:46 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
188cfbd973b4a999682b8826071169fe3afdfd971dd938fe840e8fd3265b9e5b83fb9a7186ba6e00
Parents:
1b7bc4cdfc3efa77d24a9245038005aba1b0df36
Message:
fix (windows port): move reference to NF/BBA stuff to function pointers
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • Singular/misc_ip.cc

    r1b7bc4 r7203f7  
    1212
    1313// include header files
     14#define PLURAL_INTERNAL_DECLARATIONS 1
    1415
    1516#include <kernel/mod2.h>
    … …  
    2930#include <polys/ext_fields/algext.h>
    3031#include <polys/ext_fields/transext.h>
     32#include <polys/nc/gb_hack.h>
    3133
    3234#ifdef HAVE_SIMPLEIPC
    … …  
    13091311  }
    13101312#endif
     1313// setting routines for PLURAL QRINGS:
     1314  nc_NF=k_NF;
     1315  gnc_gr_bba=k_gnc_gr_bba;
     1316  gnc_gr_mora=k_gnc_gr_mora;
     1317  sca_bba=k_sca_bba;
     1318  sca_mora=k_sca_mora;
     1319  sca_gr_bba=k_sca_gr_bba;
    13111320// loading standard.lib -----------------------------------------------
    13121321  if (! feOptValue(FE_OPT_NO_STDLIB))

  • dox/Doxyfile.in

    r1b7bc4 r7203f7  
    20452045OMALLOC_USES_SYSTEM_MALLOC \
    20462046PLURAL_INTERNAL_DECLARATIONS \
    2047 PLURAL_INTERNAL_DECLARATIONS_GB_HACK \
    20482047SEMIC_PRINT \
    20492048SI_COUNTEDREF_AUTOLOAD \

  • kernel/GBEngine/gr_kstd2.cc

    r1b7bc4 r7203f7  
    10501050#define MYTEST 0
    10511051
    1052 ideal gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
     1052ideal k_gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
    10531053{
    10541054  const ring save = currRing; if( currRing != _currRing ) rChangeCurrRing(_currRing);
    … …  
    13121312}
    13131313
    1314 ideal gnc_gr_mora(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
     1314ideal k_gnc_gr_mora(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
    13151315{
    13161316#ifndef SING_NDEBUG

  • kernel/GBEngine/kutil.h

    r1b7bc4 r7203f7  
    270270extern int HCord;
    271271
    272 class skStrategy;
    273 typedef skStrategy * kStrategy;
    274272class skStrategy : public omallocClass
    275273{

  • kernel/GBEngine/nc.h

    r1b7bc4 r7203f7  
    3131  assume(r->GetNC()->p_Procs.GB!=NULL);
    3232
    33   GB_Proc_Ptr gb = cast_A_to_B<void*, GB_Proc_Ptr>(r->GetNC()->p_Procs.GB);
     33  BBA_Proc gb = cast_A_to_B<void*, BBA_Proc>(r->GetNC()->p_Procs.GB);
    3434
    3535  // NOTE: the following code block is a hack in order to make a linker to

  • kernel/GBEngine/sca.cc

    r1b7bc4 r7203f7  
    9999
    100100
    101 ideal sca_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
     101ideal k_sca_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
    102102{
    103103  const ring save = currRing;
    … …  
    373373
    374374// Under development!!!
    375 ideal sca_bba (const ideal F, const ideal Q, const intvec */*w*/, const intvec * /*hilb*/, kStrategy strat, const ring _currRing)
     375ideal k_sca_bba (const ideal F, const ideal Q, const intvec */*w*/, const intvec * /*hilb*/, kStrategy strat, const ring _currRing)
    376376{
    377377  const ring save = currRing;
    … …  
    897897
    898898// ideal sca_mora (ideal F, ideal Q, intvec *w, intvec *, kStrategy strat)
    899 ideal sca_mora(const ideal F, const ideal Q, const intvec */*w*/, const intvec *, kStrategy strat, const ring _currRing)
     899ideal k_sca_mora(const ideal F, const ideal Q, const intvec */*w*/, const intvec *, kStrategy strat, const ring _currRing)
    900900{
    901901  const ring save = currRing;

  • kernel/combinatorics/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/fglm/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/groebner_walk/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/linear_algebra/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/maps/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/numeric/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/oswrapper/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • kernel/spectrum/test.cc

    r1b7bc4 r7203f7  
    2323#ifndef PLURAL_INTERNAL_DECLARATIONS
    2424#define PLURAL_INTERNAL_DECLARATIONS
    25 #endif
    26 
    27 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    28 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2925#endif
    3026

  • libpolys/polys/monomials/ring.h

    r1b7bc4 r7203f7  
    200200typedef struct nc_struct   nc_struct;
    201201#endif
     202class skStrategy;
     203typedef skStrategy * kStrategy;
     204
     205typedef poly (*NF_Proc)(ideal, ideal, poly, int, int, const ring _currRing);
     206typedef ideal (*BBA_Proc) (const ideal, const ideal, const intvec *, const intvec *, kStrategy strat, const ring);
     207
    202208
    203209struct ip_sring

  • libpolys/polys/nc/gb_hack.h

    r1b7bc4 r7203f7  
    55
    66#ifdef PLURAL_INTERNAL_DECLARATIONS
     7#include <polys/nc/nc.h>
    78
    89struct  spolyrec; typedef struct spolyrec    polyrec; typedef polyrec *          poly;
    … …  
    1213class intvec;
    1314
    14 class skStrategy; typedef skStrategy * kStrategy;
    15 typedef ideal (*GB_Proc_Ptr)(const ideal, const ideal, const intvec*, const intvec*, kStrategy, const ring);
     15extern NF_Proc nc_NF;
     16extern BBA_Proc gnc_gr_bba, gnc_gr_mora, sca_bba, sca_mora, sca_gr_bba;
    1617
    17 
    18 ideal gnc_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    19 ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    20 
     18/* the realiziation of the routines above in libkernel:*/
     19ideal k_gnc_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
     20ideal k_gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2121/// Modified Plural's Buchberger's algorithmus.
    22 ideal sca_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
     22ideal k_sca_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2323
    2424/// Modified modern Sinuglar Buchberger's algorithm.
    25 ideal sca_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
     25ideal k_sca_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2626
    2727/// Modified modern Sinuglar Mora's algorithm.
    28 ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
     28ideal k_sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2929
    30 poly k_NF(ideal, ideal, poly, int, int, const ring _currRing);
     30ideal k_sca_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    3131
    32 
    33 
    34 # ifdef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    35 
    36 extern void WerrorS(const char *);
    37 
    38 # define STR_EXPAND(tok) #tok
    39 # define D(A)    A{ WerrorS("This is a hack. Function is not defined: " STR_EXPAND(A) ); return NULL; (void)(_currRing); }
    40 
    41 D(ideal gnc_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    42 D(ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    43 
    44 /// Modified Plural's Buchberger's algorithmus.
    45 D(ideal sca_gr_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    46 
    47 /// Modified modern Sinuglar Buchberger's algorithm.
    48 D(ideal sca_bba(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    49 
    50 /// Modified modern Sinuglar Mora's algorithm.
    51 D(ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    52 
    53 D(poly k_NF(ideal, ideal, poly, int, int, const ring _currRing))
    54 
    55 #endif // # ifdef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    5632#endif // PLURAL_INTERNAL_DECLARATIONS
    57 
    5833
    5934#endif // HAVE_PLURAL

  • libpolys/polys/nc/old.gring.cc

    r1b7bc4 r7203f7  
    6363// #endif
    6464
     65static poly NF_Proc_Dummy(ideal, ideal, poly, int, int, const ring _currRing)
     66{ WerrorS("nc_NF not defined"); return NULL; }
     67static ideal BBA_Proc_Dummy (const ideal, const ideal, const intvec *, const intvec *, kStrategy strat, const ring)
     68{ WerrorS("nc_NF not defined"); return NULL; }
     69
     70// the following funtion poiters are quasi-static:
     71// they will be set in siInit and never changes afterwards:
     72NF_Proc nc_NF=NF_Proc_Dummy;
     73BBA_Proc gnc_gr_bba=BBA_Proc_Dummy;
     74BBA_Proc gnc_gr_mora=BBA_Proc_Dummy;
     75BBA_Proc sca_bba=BBA_Proc_Dummy;
     76BBA_Proc sca_mora=BBA_Proc_Dummy;
     77BBA_Proc sca_gr_bba=BBA_Proc_Dummy;
    6578
    6679/* copy : */

  • libpolys/polys/nc/sca.cc

    r1b7bc4 r7203f7  
    11181118      // square = NF( var(i)^2 | Q )
    11191119      // NOTE: there is no better way to check this in general!
    1120       square = k_NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
     1120      square = nc_NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
    11211121
    11221122      if( square != NULL ) // var(i)^2 is not in Q?

  • libpolys/polys/test.cc

    r1b7bc4 r7203f7  
    1515#ifndef PLURAL_INTERNAL_DECLARATIONS
    1616#define PLURAL_INTERNAL_DECLARATIONS
    17 #endif
    18 
    19 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    20 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    2117#endif
    2218

  • libpolys/tests/common.h

    r1b7bc4 r7203f7  
    2424#ifndef PLURAL_INTERNAL_DECLARATIONS
    2525#define PLURAL_INTERNAL_DECLARATIONS
    26 #endif
    27 
    28 #ifndef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    29 #define PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    3026#endif
    3127
Note: See TracChangeset for help on using the changeset viewer.