Changeset a0e7db in git


Ignore:
Timestamp:
Aug 7, 2014, 4:05:36 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '60097d763e0b541617a3b864b5310c523edaf81d')
Children:
fde66a9b59619d7999ad28b0c18422dcddba436a
Parents:
ffd4a9600207a9670cfe0cb81450accbaaec26d7
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-08-07 16:05:36+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-08-07 16:12:11+02:00
Message:
bug fixes for walk stuff
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/walk.cc

    rffd4a9 ra0e7db  
    5555#include <misc/options.h>
    5656#include <omalloc/omalloc.h>
    57 #include <kernel/febase.h>
    5857#include <Singular/ipshell.h>
    5958#include <Singular/ipconv.h>
     
    6665
    6766/* include Hilbert-function */
    68 #include <kernel/stairc.h>
     67#include <kernel/GBEngine/stairc.h>
    6968
    7069/** kstd2.cc */
    71 #include <kernel/kutil.h>
    72 #include <kernel/khstd.h>
     70#include <kernel/GBEngine/kutil.h>
     71#include <kernel/GBEngine/khstd.h>
    7372
    7473#include <Singular/walk.h>
     
    7776#include <Singular/ipid.h>
    7877#include <Singular/tok.h>
    79 #include <kernel/febase.h>
    8078#include <coeffs/numbers.h>
    8179#include <Singular/ipid.h>
    8280#include <polys/monomials/ring.h>
    83 #include <kernel/kstd1.h>
     81#include <kernel/GBEngine/kstd1.h>
    8482#include <polys/matpol.h>
    8583#include <polys/weight.h>
    8684#include <misc/intvec.h>
    87 #include <kernel/syz.h>
     85#include <kernel/GBEngine/syz.h>
    8886#include <Singular/lists.h>
    8987#include <polys/prCopy.h>
     
    750748{
    751749  int i, nR = iv->length();
    752  
     750
    753751  intvec* ivm = new intvec(nR*nR);
    754752
     
    771769  assume(iv->length() == iw->length());
    772770  int i, nR = iv->length();
    773  
     771
    774772  intvec* ivm = new intvec(nR*nR);
    775773
     
    914912     {
    915913       mpz_set(tot_deg, maxdeg);
    916      } 
     914     }
    917915  }
    918916  mpz_mul_ui(inveps, tot_deg, maxA);
     
    17561754  }
    17571755  mpz_t *vec=(mpz_t*)omAlloc(nRing*sizeof(mpz_t));
    1758  
     1756
    17591757
    17601758  // there is no 0<t<=1, so define the next weight vector to be equal to the current weight vector
     
    18061804    mpz_add(sntz, s_nenner, s_zaehler);
    18071805    mpz_init_set(vec[j], sntz);
    1808    
     1806
    18091807#ifdef NEXT_VECTORS_CC
    18101808    Print("\n//** MwalkNextWeightCC:  j = %d ==> ", j);
     
    19131911        mpz_out_str( stdout, 10, vec[j]);
    19141912        PrintS(" is greater than 2147483647 (max. integer representation)");
    1915         Print("\n//  So vector[%d] := %d may be wrong.\n",j+1, vec[j]);
     1913        Print("\n//  So vector[%d] may be wrong.\n",j+1/*,gmp: vec[j]*/);
    19161914      }
    19171915    }
     
    19351933  mpz_clear(dcw);
    19361934  mpz_clear(t_null);
    1937  
     1935
    19381936  if(Overflow_Error == FALSE)
    19391937  {
     
    22202218
    22212219  // complete ring intializations
    2222  
     2220
    22232221  rComplete(r);
    22242222
     
    22952293
    22962294  // complete ring intializations
    2297  
     2295
    22982296  rComplete(r);
    22992297
     
    23592357
    23602358  /* complete ring intializations */
    2361  
     2359
    23622360  rComplete(r);
    23632361
     
    24892487
    24902488  // complete ring intializations
    2491  
     2489
    24922490  rComplete(r);
    24932491
     
    29722970#ifdef INVEPS_SMALL_IN_TRAN
    29732971  if(mpz_cmp_ui(ndeg, nV)>0 && nV > 3)
    2974   { 
     2972  {
    29752973    mpz_cdiv_q_ui(ndeg, ndeg, nV);
    29762974  }
     
    38363834          (*result)[i] = (*next_weight1)[i];
    38373835        }
    3838       }   
     3836      }
    38393837    }
    38403838    else
     
    40564054    // compute a next weight vector
    40574055    intvec* next_weight = MkInterRedNextWeight(curr_weight,target_weight, G);
    4058  
     4056
    40594057
    40604058    xtnw = xtnw + clock() - to;
     
    42734271    {
    42744272      hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
    4275     }   
     4273    }
    42764274    else
    42774275    {
     
    45614559    {
    45624560      hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
    4563     }   
     4561    }
    45644562    else
    45654563    {
     
    48314829    {
    48324830      hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
    4833     }   
     4831    }
    48344832    else
    48354833    {
     
    50405038    {
    50415039      hilb_func = hFirstSeries(Gomega,NULL,NULL,curr_weight,currRing);
    5042     }   
     5040    }
    50435041    else
    50445042    {
     
    63126310#endif
    63136311        tproc = clock()-xftinput;
    6314        
     6312
    63156313        Print("\n//  main routine takes %d steps and calls \"Mpwalk\" (1,%d):", nwalk,  tp_deg);
    6316        
     6314
    63176315        // compute the red. GB of <G> w.r.t. the lex order by the "recursive-modified" perturbation walk alg (1,tp_deg)
    63186316        G = Mpwalk_MAltwalk1(G, curr_weight, tp_deg);
Note: See TracChangeset for help on using the changeset viewer.