Changeset 77bb59 in git


Ignore:
Timestamp:
Aug 12, 2011, 7:28:54 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
Children:
d1433769dfd20e9bf7a4179195d41d4095c91fc7
Parents:
d914cf06d3d3be1689cf60fc38f82a7c3dbdf2c6
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 19:28:54+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:24:03+01:00
Message:
CHG: minor changes
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    rd914cf0 r77bb59  
    8181
    8282
    83 lists rDecompose(const ring r);
    84 ring rCompose(const lists  L);
     83lists rDecompose(const ring r); ring rCompose(const lists  L);
    8584
    8685
  • Singular/ipshell.cc

    rd914cf0 r77bb59  
    66* ABSTRACT:
    77*/
    8 
    9 #include <math.h>
     8#include <kernel/mod2.h>
     9#include <misc/auxiliary.h>
     10
    1011
    1112#include <misc/options.h>
    12 #include <misc/auxiliary.h>
     13#include <misc/mylimits.h>
     14
    1315#ifdef HAVE_FACTORY
    1416#define SI_DONT_HAVE_GLOBAL_VARS
     
    1719
    1820#include <Singular/maps_ip.h>
    19 #include <kernel/mod2.h>
    2021#include <Singular/tok.h>
    2122#include <misc/options.h>
     
    4647#include <kernel/splist.h>
    4748#include <kernel/spectrum.h>
    48 #include <coeffs/gnumpfl.h>
     49////// #include <coeffs/gnumpfl.h>
    4950//#include <kernel/mpr_base.h>
    50 #include <coeffs/ffields.h>
     51////// #include <coeffs/ffields.h>
    5152#include <polys/clapsing.h>
    5253#include <kernel/hutil.h>
     
    5556#include <polys/ext_fields/algext.h>
    5657#include <coeffs/mpr_complex.h>
    57 #include <coeffs/longrat.h>
     58////// #include <coeffs/longrat.h>
    5859#include <numeric/mpr_base.h>
    5960#include <numeric/mpr_numeric.h>
     61
     62#include <math.h>
    6063
    6164// define this if you want to use the fast_map routine for mapping ideals
     
    659662    //             rPar(IDRING(r)),
    660663    //             IDRING(r)->minpoly)))
    661     if ((nMap=nSetMap(IDRING(r)->cf))==NULL)
    662     {
    663       if (rEqual(IDRING(r),currRing))
    664       {
    665         nMap=n_SetMap(currRing->cf, currRing->cf);
    666       }
    667       else
    668       {
     664    if ((nMap=n_SetMap(IDRING(r)->cf, currRing->cf))==NULL)
     665    {
     666////////// WTF?
     667//      if (rEqual(IDRING(r),currRing))
     668//      {
     669//        nMap = n_SetMap(currRing->cf, currRing->cf);
     670//      }
     671//      else
     672//      {
    669673        Werror("can not map from ground field of %s to current ground field",
    670674          theMap->preimage);
    671675        return NULL;
    672       }
     676//      }
    673677    }
    674678    if (IDELEMS(theMap)<IDRING(r)->N)
     
    48814885}
    48824886
     4887const short MAX_SHORT = SHRT_MAX; // (1 << (sizeof(short)*8)) - 1;
     4888
    48834889////////////////////
    48844890//
     
    51035109  {
    51045110    int l=rv->listLength();
    5105 #if SIZEOF_SHORT == 2
    5106 #define MAX_SHORT 0x7fff
    5107 #endif
     5111
    51085112    if (l>MAX_SHORT)
    51095113    {
  • kernel/gr_kstd2.cc

    rd914cf0 r77bb59  
    1919#include <polys/weight.h>
    2020#include <polys/polys.h>
     21#include <polys/monomials/ring.h>
    2122
    2223#include <polys/nc/nc.h>
  • libpolys/misc/mylimits.h

    rd914cf0 r77bb59  
    1919#else
    2020#include <limits.h>
    21 
    2221#endif
    2322
  • libpolys/polys/monomials/ring.cc

    rd914cf0 r77bb59  
    55435543  assume(C != NULL);
    55445544
    5545   if( rField_is_Extension(r) )
     5545  const BOOLEAN ret = nCoeff_is_algExt(C);
     5546 
     5547  if( ret )
    55465548  {
    55475549    const ring R = C->extRing;
    55485550    assume( R != NULL );
    5549     return idIs0(R->minideal);
    5550   }
    5551   return TRUE;
     5551    assume( !idIs0(R->minideal) );
     5552  }
     5553 
     5554  return ret;
    55525555}
    55535556
  • standalone.test/test.cc

    rd914cf0 r77bb59  
    115115
    116116
    117 BOOLEAN simple(const n_coeffType _type, cfInitCharProc p, void* param = NULLp)
     117BOOLEAN simple(const n_coeffType _type, void* param = NULLp)
    118118{
    119   n_coeffType type = nRegister( _type, p);
    120   assume( type == _type ); // ?
    121   return ( Test(type, param) );
     119//  n_coeffType type = nRegister( _type, p);
     120//  assume( type == _type ); // ?
     121  return ( Test(_type, param) );
    122122}
    123123
     
    132132  PrintS(StringAppendS("\n"));
    133133  // longrat
    134   extern BOOLEAN nlInitChar(coeffs, void*); // Q
    135   if( simple(n_Q, nlInitChar) )
     134  if( simple(n_Q) )
    136135    PrintS("Q: Test Passed!");
    137136  else
     
    140139
    141140  // modulop
    142   extern BOOLEAN npInitChar(coeffs, void*); // Zp
    143   if( simple(n_Zp, npInitChar, (void*)7) )
     141  if( simple(n_Zp, (void*)7) )
    144142    PrintS("Zp: Test Passed!");
    145143  else
     
    148146 
    149147  // due to coeffs/ffields.h
    150   extern BOOLEAN nfInitChar(coeffs, void*); // GF
    151148  struct
    152149  {
     
    160157  param.GFPar_name= (const char*)"Q";
    161158
    162   if( simple(n_GF, nfInitChar, (void*)&param) )
     159  if( simple(n_GF, (void*)&param) )
    163160    PrintS("GF: Test Passed!");
    164161  else
Note: See TracChangeset for help on using the changeset viewer.