Changeset c16aa0 in git


Ignore:
Timestamp:
Sep 15, 2010, 6:57:37 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')
Children:
2f6fc61a1a128638d659e6d6e3d666b11f9e763a
Parents:
c722540c7b58ede1c51a513cbac110db441c9c7f
Message:
compile also without HAVE_FACTORY

git-svn-id: file:///usr/local/Singular/svn/trunk@13196 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Singular/extra.cc

    rc72254 rc16aa0  
    32913291  #endif
    32923292  /*==================== gcd-varianten =================*/
     3293  #ifdef HAVE_FACTORY
    32933294      if (strcmp(sys_cmd, "gcd") == 0)
    32943295      {
    … …  
    33273328      }
    33283329      else
     3330  #endif
    33293331  /*==================== subring =================*/
    33303332      if (strcmp(sys_cmd, "subring") == 0)
    … …  
    33413343      else
    33423344  /*==================== HNF =================*/
     3345  #ifdef HAVE_FACTORY
    33433346      if (strcmp(sys_cmd, "HNF") == 0)
    33443347      {
    … …  
    33613364      }
    33623365      else
     3366  #endif
    33633367  #ifdef ix86_Win
    33643368  /*==================== Python Singular =================*/

  • Singular/interpolation.cc

    rc72254 rc16aa0  
    1414#include <Singular/ipid.h>
    1515#include <kernel/ring.h>
    16 #include <factory.h>
     16#ifdef HAVE_FACTORY
     17//#include <factory.h>
     18#endif
    1719
    1820//memory management
    … …  
    10381040modp_number TakePrime (modp_number p)  // takes "previous" (smaller) prime
    10391041{
    1040     modp_number d;
     1042#ifdef HAVE_FACTORY
    10411043    myp_index--;
    10421044    return cf_getSmallPrime(myp_index);
     1045#else
     1046    return IsPrime(p-1);
     1047#endif
    10431048}
    10441049
    … …  
    16211626  bool correct_gen=false;
    16221627  if (only_modp) modp_cycles=1;
     1628  #ifdef HAVE_FACTORY
    16231629  myp_index=cf_getNumSmallPrimes ();
     1630  #endif
    16241631
    16251632  while ((!correct_gen)&&(myp_index>1))

  • Singular/iparith.cc

    rc72254 rc16aa0  
    17541754  return r;
    17551755}
     1756#ifdef HAVE_FACTORY
    17561757static BOOLEAN jjCHINREM_BI(leftv res, leftv u, leftv v)
    17571758{
    … …  
    17811782  else return TRUE;
    17821783}
     1784#endif
    17831785#if 0
    17841786static BOOLEAN jjCHINREM_P(leftv res, leftv u, leftv v)
    … …  
    18441846}
    18451847#endif
     1848#ifdef HAVE_FACTORY
    18461849static BOOLEAN jjCHINREM_ID(leftv res, leftv u, leftv v)
    18471850{
    … …  
    19221925  else return TRUE;
    19231926}
     1927#endif
    19241928static BOOLEAN jjCOEF(leftv res, leftv u, leftv v)
    19251929{
    … …  
    36253629,{jjBRACKET,   BRACKET_CMD,    POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_PLURAL | NO_RING}
    36263630#endif
     3631#ifdef HAVE_FACTORY
    36273632,{jjCHINREM_BI,CHINREM_CMD,    BIGINT_CMD,     INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
    36283633//,{jjCHINREM_P, CHINREM_CMD,    POLY_CMD,       LIST_CMD,   INTVEC_CMD, ALLOW_PLURAL}
    36293634,{jjCHINREM_ID,CHINREM_CMD,    ANY_TYPE/*set by p*/,LIST_CMD,INTVEC_CMD, ALLOW_PLURAL |NO_RING}
    36303635,{jjCHINREM_ID,CHINREM_CMD,    ANY_TYPE/*set by p*/,LIST_CMD,LIST_CMD, ALLOW_PLURAL |NO_RING}
     3636#else
     3637,{jjWRONG2,    CHINREM_CMD,    BIGINT_CMD,     INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
     3638#endif
    36313639,{jjCOEF,      COEF_CMD,       MATRIX_CMD,     POLY_CMD,   POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
    36323640,{jjCOEFFS_Id, COEFFS_CMD,     MATRIX_CMD,     IDEAL_CMD,  POLY_CMD, ALLOW_PLURAL |ALLOW_RING}
    … …  
    56215629,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
    56225630,{jjSort_Id,    SORTVEC_CMD,     INTVEC_CMD,     MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
     5631#ifdef HAVE_FACTORY
    56235632,{jjSQR_FREE,   SQR_FREE_CMD,    IDEAL_CMD,      POLY_CMD      , NO_PLURAL |ALLOW_RING}
     5633#else
     5634,{jjWRONG,      SQR_FREE_CMD,    IDEAL_CMD,      POLY_CMD      , NO_PLURAL |ALLOW_RING}
     5635#endif
    56245636,{jjSTD,        STD_CMD,         IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
    56255637,{jjSTD,        STD_CMD,         MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}

  • Singular/ipshell.cc

    rc72254 rc16aa0  
    26742674#endif
    26752675
     2676#ifdef HAVE_FACTORY
    26762677BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w)
    26772678{
    … …  
    26842685  return (res->data==NULL);
    26852686}
     2687#endif
    26862688
    26872689// from semic.cc
Note: See TracChangeset for help on using the changeset viewer.