Changeset fde66a9 in git


Ignore:
Timestamp:
Aug 7, 2014, 4:10:35 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '60097d763e0b541617a3b864b5310c523edaf81d')
Children:
a5ab27d45c122614af41115f7486270074ab53f5
Parents:
a0e7db5bccc63a9fe9ea7898cd864a561f0656cc
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-08-07 16:10:35+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-08-07 16:12:11+02:00
Message:
format errors
Location:
Singular
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/modwalk.lib

    ra0e7db rfde66a9  
    3131proc modpWalk(def II, int p, int variant, list #)
    3232"USAGE:  modpWalk(I,p,#); I ideal, p integer, variant integer
    33 ASSUME:  If size(#) > 0, then 
     33ASSUME:  If size(#) > 0, then
    3434           #[1] is an intvec describing the current weight vector
    3535           #[2] is an intvec describing the target weight vector
    3636RETURN:  ideal - a standard basis of I mod p, integer - p
    3737NOTE:    The procedure computes a standard basis of the ideal I modulo p and
    38          fetches the result to the basering. 
     38         fetches the result to the basering.
    3939EXAMPLE: example modpWalk; shows an example
    4040"
     
    8989      {
    9090        list rl@r = ringlist(@r);
    91         nvar@r = nvars(@r);     
     91        nvar@r = nvars(@r);
    9292        intvec w;
    9393        for(k = 1; k <= nvar@r; k++)
     
    236236proc modWalk(def II, int variant, list #)
    237237"USAGE:  modWalk(II); II ideal or list(ideal,int)
    238 ASSUME:  If variant = 
     238ASSUME:  If variant =
    239239@*       - 1 the Random Walk algorithm with radius II[2] is applied
    240240           to II[1] if II = list(ideal, int). It is applied to II with radius 2
    241241           if II is an ideal.
    242 @*      - 2, the Groebner Walk algorithm is applied to II[1] or to II, respectively.
     242@*      - 2, the Groebner Walk algorithm is applied to II[1] or to II, respectively.
    243243@*       - 3, the Fractal Walk algorithm with random element is applied to II[1] or II,
    244244           respectively.
     
    246246@*       - 5, the Perturbation Walk algorithm with random element is applied to II[1]
    247247           or II, respectively, with radius II[3] and perturbation degree II[2].
    248 @*      - 6, the Perturbation Walk algorithm is applied to II[1] or II, respectively,
    249            with perturbation degree II[3].
     248@*      - 6, the Perturbation Walk algorithm is applied to II[1] or II, respectively,
     249           with perturbation degree II[3].
    250250         If size(#) > 0, then # contains either 1, 2 or 4 integers such that
    251251@*       - #[1] is the number of available processors for the computation,
     
    300300        II[3] = 2;
    301301      }
    302    
    303302    }
    304303    else
     
    378377          ERROR("Unexpected type of input.");
    379378        }
    380       } 
     379      }
    381380    }
    382381    if(size(#) == 3)
     
    739738  }
    740739  results_chinrem = parallelWaitAll("chinrem",arguments_chinrem);
    741     for(j=1; j <= size(results_chinrem); j++) 
     740    for(j=1; j <= size(results_chinrem); j++)
    742741    {
    743742      J = results_chinrem[j];
  • Singular/LIB/rwalk.lib

    ra0e7db rfde66a9  
    1 <<<<<<< HEAD
    2 =======
    31//
    4 >>>>>>> 92644b759d66f085c842e4284d78c2e203291b67
    5 version="$Id$";
     2version="version rwalk.lib 4.0.0.0 Aug_2014 ";
    63category="Commutative Algebra";
    74
  • Singular/LIB/swalk.lib

    ra0e7db rfde66a9  
    7373              l=collectDiffExpo(Gold);
    7474              ulast=last(curr_weight, target_weight, l);
    75               vector new_weight=(1-ulast)*curr_weight+ulast*target_weight;
     75              vector new_weight=(1-ulast)*curr_weight+ulast*target_weight;
    7676              vector w=cleardenom(new_weight);
    7777              v=changeType(w);
     
    138138       def old_ring=new_ring;
    139139       setring old_ring;
    140        
     140
    141141       kill new_ring;
    142142       if(curr_weight==target_weight){n=1;}
    143143       else {
    144               l=collectDiffExpo(Gold); 
     144              l=collectDiffExpo(Gold);
    145145              vector new_weight=RandomNextWeight(Gold, l, curr_weight, target_weight, weight_rad, pdeg);
    146146              vector w=cleardenom(new_weight);
  • Singular/walk.h

    ra0e7db rfde66a9  
    2424intvec* Mivlp(int nR);
    2525
    26 intvec* MivMatrixOrder(intvec* iv); 
    27 intvec* MivMatrixOrderdp(int iv); 
    28 intvec* MPertVectors(ideal G, intvec* ivtarget, int pdeg); 
    29 intvec* MPertVectorslp(ideal G, intvec* ivtarget, int pdeg); 
     26intvec* MivMatrixOrder(intvec* iv);
     27intvec* MivMatrixOrderdp(int iv);
     28intvec* MPertVectors(ideal G, intvec* ivtarget, int pdeg);
     29intvec* MPertVectorslp(ideal G, intvec* ivtarget, int pdeg);
    3030
    3131
    3232intvec* MivMatrixOrderlp(int nV);
    3333
    34 intvec* Mfpertvector(ideal G, intvec* iv); 
     34intvec* Mfpertvector(ideal G, intvec* iv);
    3535intvec* MivUnit(int nV);
    3636
    37 intvec* MivWeightOrderlp(intvec* ivstart); 
    38 intvec* MivWeightOrderdp(intvec* ivstart); 
     37intvec* MivWeightOrderlp(intvec* ivstart);
     38intvec* MivWeightOrderdp(intvec* ivstart);
    3939
    40 ideal MidLift(ideal Gomega, ideal M); 
     40ideal MidLift(ideal Gomega, ideal M);
    4141ideal MLiftLmalG(ideal L, ideal G);
    42 ideal MLiftLmalGNew(ideal Gomega, ideal M, ideal G); 
    43 ideal MLiftLmalGMin(ideal L, ideal G); 
     42ideal MLiftLmalGNew(ideal Gomega, ideal M, ideal G);
     43ideal MLiftLmalGMin(ideal L, ideal G);
    4444
    4545
     
    5252
    5353/* Okt -- Nov'01 */
    54 // compute a Groebner basis of an ideal G w.r.t. lexicographic order 
     54// compute a Groebner basis of an ideal G w.r.t. lexicographic order
    5555ideal Mwalk(ideal Go, intvec* orig_M, intvec* target_M, ring baseRing);
    5656// random walk algorithm to compute a Groebner basis
     
    7878
    7979/* the first alternative algorithm */
    80 ideal MAltwalk1(ideal G,int op,int tp,intvec* curr_weight,intvec* target_weight); 
     80ideal MAltwalk1(ideal G,int op,int tp,intvec* curr_weight,intvec* target_weight);
    8181
    8282/* the second alternative algorithm */
    83 ideal MAltwalk2(ideal G, intvec* curr_weight, intvec* target_weight); 
     83ideal MAltwalk2(ideal G, intvec* curr_weight, intvec* target_weight);
    8484
    8585#endif  //WALK_H
Note: See TracChangeset for help on using the changeset viewer.