Changeset 6cf934 in git
- Timestamp:
- Nov 14, 2022, 11:41:51 AM (3 months ago)
- Branches:
- (u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
- Children:
- c57af60be7b45c4f30db8913b7cde4eb782e6121
- Parents:
- c858487b7689b030112512a2e1be0f968d4f7c22
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
.codespell_ignore
rc858487 r6cf934 1 alle 2 als 3 degres 1 4 ende 2 5 erros 6 funktion 3 7 froms 4 8 fromt … … 8 12 nin 9 13 nnumber 14 oder 10 15 padd 11 16 preverse 17 pres 12 18 ressources 13 19 sring 14 20 strat 21 thev 15 22 witht 16 23 wth -
kernel/fglm/fglmcomb.cc
rc858487 r6cf934 164 164 165 165 int * weights = NULL; 166 int * length es = NULL;166 int * lengths = NULL; 167 167 int * order = NULL; 168 168 … … 174 174 STICKYPROT2( "%i monoms\n", numMonoms ); 175 175 176 // All coate Memory and initialize sets176 // Allocate Memory and initialize sets 177 177 m= (polyset)omAlloc( numMonoms * sizeof( poly ) ); 178 178 poly temp= monset; … … 216 216 } 217 217 STICKYPROT( "\n" ); 218 length es= (int *)omAlloc( numMonoms * sizeof( int ) );218 lengths= (int *)omAlloc( numMonoms * sizeof( int ) ); 219 219 order= (int *)omAlloc( numMonoms * sizeof( int ) ); 220 220 … … 307 307 STICKYPROT( "sizes: " ); 308 308 for ( k= 0; k < numMonoms; k++ ) { 309 length es[k]= v[k].numNonZeroElems();310 STICKYPROT2( "%i ", length es[k] );309 lengths[k]= v[k].numNonZeroElems(); 310 STICKYPROT2( "%i ", lengths[k] ); 311 311 } 312 312 STICKYPROT( "\n" ); … … 316 316 int best = 0; 317 317 for ( k= numMonoms - 1; k >= 0; k-- ) { 318 if ( length es[k] > 0 ) {318 if ( lengths[k] > 0 ) { 319 319 if ( best == 0 ) { 320 320 best= k+1; 321 321 } 322 322 else { 323 if ( length es[k] < lengthes[best-1] ) {323 if ( lengths[k] < lengths[best-1] ) { 324 324 best= k+1; 325 325 } … … 327 327 } 328 328 } 329 length es[best-1]= 0;329 lengths[best-1]= 0; 330 330 order[act]= best-1; 331 331 STICKYPROT2( " (%i) ", best ); … … 382 382 } 383 383 // Free Memory 384 omFreeSize( (ADDRESS)length es, numMonoms * sizeof( int ) );384 omFreeSize( (ADDRESS)lengths, numMonoms * sizeof( int ) ); 385 385 omFreeSize( (ADDRESS)order, numMonoms * sizeof( int ) ); 386 386 // for ( k= 0; k < numMonoms; k++ ) -
kernel/fglm/fglmgauss.cc
rc858487 r6cf934 6 6 /* 7 7 * ABSTRACT - class gaussReducer. Used in fglmzero.cc and fglmhom.cc 8 * to find linear depende cies of fglmVectors.8 * to find linear dependencies of fglmVectors. 9 9 */ 10 10 -
kernel/fglm/fglmhom.cc
rc858487 r6cf934 36 36 #include "factory/templates/ftmpl_list.h" 37 37 38 // obachman: Got rid of f those "redefiende messages by includeing fglm.h38 // obachman: Got rid of those "redefined" messages by including fglm.h 39 39 #include "fglm.h" 40 40 #if 0 -
kernel/fglm/fglmzero.cc
rc858487 r6cf934 572 572 } 573 573 574 // Searches through the border for a monom oial bm which devides m and returns574 // Searches through the border for a monomial bm which divides m and returns 575 575 // its normalform in vector representation. 576 576 // var contains the number of the variable v, s.t. bm = m * v … … 662 662 // returns them in "l". 663 663 // The ideal has to be zero-dimensional and reduced and has to be a 664 // real subset of the polynom al ring.664 // real subset of the polynomial ring. 665 665 // In any case it has to be zero-dimensional and minimal (check this 666 666 // via fglmIdealcheck). Any minimal but not reduced ideal is detected. … … 1087 1087 data.gaussreduce( v, p, pdenom ); 1088 1088 if ( v.isZero() ) { 1089 // Now v is linear dependen dto the already found basis elements.1090 // This means that v (r sp. candidate.monom) is the leading1089 // Now v is linear dependent to the already found basis elements. 1090 // This means that v (resp. candidate.monom) is the leading 1091 1091 // monomial of the next groebner-basis polynomial. 1092 1092 data.newGroebnerPoly( p, candidate.monom ); … … 1189 1189 } 1190 1190 1191 // for a descri tption of the parameters see fglm.h1191 // for a description of the parameters see fglm.h 1192 1192 BOOLEAN 1193 1193 fglmzero( ring sourceRing, ideal & sourceIdeal, ring destRing, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal ) -
kernel/fglm/test.cc
rc858487 r6cf934 313 313 poly p1=pISet(1); 314 314 315 // create t the polynomial 2*x^3*z^2315 // create the polynomial 2*x^3*z^2 316 316 poly p2=p_ISet(2,R); 317 317 pSetExp(p2,1,3); -
kernel/groebner_walk/walkMain.cc
rc858487 r6cf934 307 307 308 308 309 //unperturbedStartVectorStrategy IS NOW NOT AL LWAYS AS DEFAULT SET309 //unperturbedStartVectorStrategy IS NOW NOT ALWAYS AS DEFAULT SET 310 310 //TO TRUE BUT IS INPUT FROM fractalWalk64 311 311 WalkState firstFractalWalkStep64(ideal & G,int64vec* & currw64, … … 316 316 if(unperturbedStartVectorStrategy){ 317 317 return(unperturbedFirstStep64(G,currw64,destRing)); 318 //here G is updated since its ad ress is given as argument318 //here G is updated since its address is given as argument 319 319 } 320 320 … … 548 548 state=fractalRec64(Gw,sigma,destMat,level+1,step); 549 549 550 //The resulting GB is Gw since its ad ress is given as argument.550 //The resulting GB is Gw since its address is given as argument. 551 551 ideal recG=Gw; 552 552 ring temp=currRing; -
kernel/groebner_walk/walkSupport.cc
rc858487 r6cf934 739 739 //leadExp 740 740 /////////////////////////////////////////////////////////////////// 741 //Description: returns an intvec contain g the exponet vector of p741 //Description: returns an intvec containing the exponent vector of p 742 742 /////////////////////////////////////////////////////////////////// 743 743 //Uses: sizeof,omAlloc,omFree … … 971 971 //matIdLift 972 972 /////////////////////////////////////////////////////////////////// 973 //Description: yields the same res lut as lift in Singular973 //Description: yields the same result as lift in Singular 974 974 /////////////////////////////////////////////////////////////////// 975 975 //Uses: idLift,idModule2formatedMatrix -
kernel/linear_algebra/Cache.h
rc858487 r6cf934 255 255 * If so, the method returns true; false otherwise. 256 256 * In order to make Cache::getValue (const KeyClass&) const 257 * work properly, the user is strongly advi ced to always check key257 * work properly, the user is strongly advised to always check key 258 258 * containment by means of Cache::hasKey (const KeyClass&) const. 259 259 * (The implementation at hand ensures that invoking hasKey and … … 292 292 * newly inserted pair (key --> value).<br> 293 293 * Because of that undesirable but possible effect, the method returns 294 * whether the pair is actually contained in the cache after invo kation of294 * whether the pair is actually contained in the cache after invocation of 295 295 * Cache::put (const KeyClass&, const ValueClass&). 296 296 * @param key an instance of KeyClass -
kernel/linear_algebra/Minor.cc
rc858487 r6cf934 757 757 }; 758 758 _columnKey[newBitBlockIndex] = anInt; 759 /* ...and we delete all entries in _columnKey[i] fo 759 /* ...and we delete all entries in _columnKey[i] for 760 760 0 <= i < newBitBlockIndex */ 761 761 for (int i = 0; i < newBitBlockIndex; i++) -
kernel/linear_algebra/Minor.h
rc858487 r6cf934 456 456 * on MinorValues has an impact on the caching behaviour in a given cache: 457 457 * Greater MinorValues will be cached longer than lower ones.<br> 458 * More explicit ely, this means: Make the return value of this method458 * More explicitly, this means: Make the return value of this method 459 459 * greater, and the given MinorValue will be cached longer when caching 460 460 * strategy 1 is deployed.<br> … … 472 472 * in a given cache: Greater MinorValues will be cached longer than lower 473 473 * ones.<br> 474 * More explicit ely, this means: Make the return value of this method474 * More explicitly, this means: Make the return value of this method 475 475 * greater, and the given MinorValue will be cached longer when caching 476 476 * strategy 1 is deployed.<br> … … 490 490 * in a given cache: Greater MinorValues will be cached longer than lower 491 491 * ones.<br> 492 * More explicit ely, this means: Make the return value of this method492 * More explicitly, this means: Make the return value of this method 493 493 * greater, and the given MinorValue will be cached longer when caching 494 494 * strategy 1 is deployed.<br> … … 507 507 * in a given cache: Greater MinorValues will be cached longer than lower 508 508 * ones.<br> 509 * More explicit ely, this means: Make the return value of this method509 * More explicitly, this means: Make the return value of this method 510 510 * greater, and the given MinorValue will be cached longer when caching 511 511 * strategy 1 is deployed.<br> … … 524 524 * in a given cache: Greater MinorValues will be cached longer than lower 525 525 * ones.<br> 526 * More explicit ely, this means: Make the return value of this method526 * More explicitly, this means: Make the return value of this method 527 527 * greater, and the given MinorValue will be cached longer when caching 528 528 * strategy 1 is deployed.<br> … … 663 663 * of the underlying cache: Greater MinorValues will be cached longer than 664 664 * lower ones.<br> 665 * More explicit ely, this means: Make the return value of this method665 * More explicitly, this means: Make the return value of this method 666 666 * greater, and the given MinorValue will be cached longer.<br> 667 667 * Internally, this method will call one of several implementations, -
kernel/linear_algebra/interpolation.cc
rc858487 r6cf934 129 129 STATIC_VAR bool denom_divisible; // common denominator is divisible by p (not used for modp) 130 130 131 STATIC_VAR poly comparizon_p1; //polynomials used to do compari zons by Singular131 STATIC_VAR poly comparizon_p1; //polynomials used to do comparisons by Singular 132 132 STATIC_VAR poly comparizon_p2; 133 133 … … 974 974 975 975 976 static void NewGenerator (mono_type mon) // new generator in modp comp found, shoul be stored on the list976 static void NewGenerator (mono_type mon) // new generator in modp comp found, should be stored on the list 977 977 { 978 978 generator_entry *cur_ptr; … … 1014 1014 } 1015 1015 #if 0 /* only debbuging */ 1016 void PresentGenerator (int i) // only for debug ing, writes a generator in its form in program1016 void PresentGenerator (int i) // only for debugging, writes a generator in its form in program 1017 1017 { 1018 1018 int j; … … 1164 1164 } 1165 1165 1166 static void Discard () // some unlucky prime occur es1166 static void Discard () // some unlucky prime occurs 1167 1167 { 1168 1168 modp_result_entry *temp; -
kernel/linear_algebra/test.cc
rc858487 r6cf934 314 314 poly p1=pISet(1); 315 315 316 // create t the polynomial 2*x^3*z^2316 // create the polynomial 2*x^3*z^2 317 317 poly p2=p_ISet(2,R); 318 318 pSetExp(p2,1,3); -
kernel/maps/fast_maps.cc
rc858487 r6cf934 432 432 **********************************************************************/ 433 433 434 // substitute p everywhere the monomial occ ours,434 // substitute p everywhere the monomial occurs, 435 435 // return the number of substitutions 436 436 static int maPoly_Substitute(macoeff c, poly p, ring dest_r) -
kernel/maps/fast_maps.h
rc858487 r6cf934 75 75 // inserts ("adds") monomial what into poly into 76 76 // returns the maMonomial which was inserted, or, if an equal one was found, 77 // the monomial which "swallo ed" the monomial77 // the monomial which "swallowed" the monomial 78 78 // It furthermore might reset into 79 79 mapoly maPoly_InsertMonomial(mapoly &into, mapoly what, ring src_r); … … 96 96 ring &src_r, ring &dest_r, BOOLEAN &no_sort); 97 97 98 // collects t the results into an ideal and destroys maideal98 // collects the results into an ideal and destroys maideal 99 99 ideal maIdeal_2_Ideal(maideal ideal, ring dest_r); 100 100 -
kernel/maps/find_perm.cc
rc858487 r6cf934 4 4 /*************************************************************** 5 5 * File: find_perm.cc 6 * Purpose: is a map a permu ation ?6 * Purpose: is a map a permutation ? 7 7 * Author: hannes 8 8 * Created: 16/01 -
kernel/maps/gen_maps.cc
rc858487 r6cf934 109 109 } 110 110 // ---------------------------------------------------------- 111 // long polys in the image ?: possib lity of many common subexpressions111 // long polys in the image ?: possibility of many common subexpressions 112 112 if ((nMap==ndCopyMap) /* and !rIsPluralRing(image_r) */ 113 113 && (map_id->nrows==1) /* i.e. only for ideal/map */ -
kernel/maps/test.cc
rc858487 r6cf934 314 314 poly p1=pISet(1); 315 315 316 // create t the polynomial 2*x^3*z^2316 // create the polynomial 2*x^3*z^2 317 317 poly p2=p_ISet(2,R); 318 318 pSetExp(p2,1,3); -
kernel/numeric/mpr_base.cc
rc858487 r6cf934 95 95 96 96 /* Remaps a result of LP to the according point set Qi. 97 * Returns false iff remap ing was not possible, otherwise true.97 * Returns false iff remapping was not possible, otherwise true. 98 98 */ 99 99 bool remapXiToPoint( const int indx, pointSet **pQ, int *set, int *vtx ); … … 176 176 inline onePointP operator[] ( const int index ); 177 177 178 /** Adds a point to pointSet, copy vert[0,...,dim] otpoint[num+1][0,...,dim].178 /** Adds a point to pointSet, copy vert[0,...,dim] to point[num+1][0,...,dim]. 179 179 * Returns false, iff additional memory was allocated ( i.e. num >= max ) 180 180 * else returns true … … 182 182 bool addPoint( const onePointP vert ); 183 183 184 /** Adds a point to pointSet, copy vert[0,...,dim] otpoint[num+1][0,...,dim].184 /** Adds a point to pointSet, copy vert[0,...,dim] to point[num+1][0,...,dim]. 185 185 * Returns false, iff additional memory was allocated ( i.e. num >= max ) 186 186 * else returns true … … 188 188 bool addPoint( const int * vert ); 189 189 190 /** Adds a point to pointSet, copy vert[0,...,dim] otpoint[num+1][0,...,dim].190 /** Adds a point to pointSet, copy vert[0,...,dim] to point[num+1][0,...,dim]. 191 191 * Returns false, iff additional memory was allocated ( i.e. num >= max ) 192 192 * else returns true … … 295 295 void runMayanPyramid( int dim ); 296 296 297 /** Compute v-distance via Linear Program ing297 /** Compute v-distance via Linear Programming 298 298 * Linear Program finds the v-distance of the point in accords[]. 299 299 * The v-distance is the distance along the direction v to boundary of … … 1197 1197 { // acoords[dim] >= minR ?? 1198 1198 mprSTICKYPROT(ST_SPARSE_MREC1); 1199 runMayanPyramid( dim + 1 ); // recurse with hig er dimension1199 runMayanPyramid( dim + 1 ); // recurse with higher dimension 1200 1200 } 1201 1201 else … … 1207 1207 { 1208 1208 mprSTICKYPROT(ST_SPARSE_MREC2); 1209 runMayanPyramid( dim + 1 ); // recurse with hig er dimension1209 runMayanPyramid( dim + 1 ); // recurse with higher dimension 1210 1210 } 1211 1211 } … … 1256 1256 LP->n++; 1257 1257 1258 // objective fun tion, minimize1258 // objective function, minimize 1259 1259 LP->LiPM[1][LP->n] = - ( (mprfloat) (*pQ[i])[k]->point[pQ[i]->dim] / SCALEDOWN ); 1260 1260 … … 1454 1454 if ( epos == 0 ) 1455 1455 { 1456 // this can happen, if the shift ve ktor or the lift funktions1456 // this can happen, if the shift vector or the lift functions 1457 1457 // are not generically chosen. 1458 1458 Werror("resMatrixSparse::createMatrix: Found exponent not in E, id %d, set [%d, %d]!", -
kernel/numeric/test.cc
rc858487 r6cf934 314 314 poly p1=pISet(1); 315 315 316 // create t the polynomial 2*x^3*z^2316 // create the polynomial 2*x^3*z^2 317 317 poly p2=p_ISet(2,R); 318 318 pSetExp(p2,1,3);
Note: See TracChangeset
for help on using the changeset viewer.