Changeset 1a3778 in git
- Timestamp:
- Sep 28, 2022, 5:07:30 PM (19 months ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- aec6fead7ad079baf52b503b680f55839809e605
- Parents:
- 1291fb4c2054a2414ab193f6b00166905b065f98
- Location:
- IntegerProgramming
- Files:
-
- 7 edited
-
IP_algorithms.cc (modified) (13 diffs)
-
LLL.h (modified) (1 diff)
-
binomial.h (modified) (2 diffs)
-
list.cc (modified) (4 diffs)
-
matrix.cc (modified) (2 diffs)
-
matrix.h (modified) (2 diffs)
-
term_ordering.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
IntegerProgramming/IP_algorithms.cc
r1291fb r1a3778 70 70 /////////////////////////// input ///////////////////////////////////////// 71 71 72 char format_string[128]; // to verif iefile format72 char format_string[128]; // to verify file format 73 73 int constraints; // number of equality constraints 74 74 int variables; // number of variables (without auxiliary variables) … … 358 358 /////////////////////////// input ///////////////////////////////////////// 359 359 360 char format_string[128]; // to verif iefile format360 char format_string[128]; // to verify file format 361 361 int constraints; // number of equality constraints 362 362 int variables; // number of variables (without auxiliary variables) … … 655 655 /////////////////////////// input ///////////////////////////////////////// 656 656 657 char format_string[128]; // to verif iefile format657 char format_string[128]; // to verify file format 658 658 int constraints; // number of equality constraints 659 659 int variables; // number of variables (without auxiliary variables) … … 944 944 /////////////////////////// input ///////////////////////////////////////// 945 945 946 char format_string[128]; // to verif iefile format946 char format_string[128]; // to verify file format 947 947 int constraints; // number of equality constraints 948 948 int variables; // number of variables (without auxiliary variables) … … 1232 1232 /////////////////////////// input ///////////////////////////////////////// 1233 1233 1234 char format_string[128]; // to verif iefile format1234 char format_string[128]; // to verify file format 1235 1235 int constraints; // number of equality constraints 1236 1236 int variables; // number of variables … … 1405 1405 1406 1406 // read positive vector in the row space of the matrix 1407 // such a vector induces a homogen ous grading on the ideal1407 // such a vector induces a homogeneous grading on the ideal 1408 1408 1409 1409 input>>format_string; … … 1493 1493 clock_t start, end; 1494 1494 1495 // construct homogen ous term ordering1495 // construct homogeneous term ordering 1496 1496 term_ordering w(variables, hom_grad, W_REV_LEX, HOMOGENEOUS); 1497 1497 … … 2009 2009 /////////////////////////// input ///////////////////////////////////////// 2010 2010 2011 char format_string[128]; // to verif iefile format2011 char format_string[128]; // to verify file format 2012 2012 int constraints; // number of equality constraints 2013 2013 int variables; // number of variables … … 2189 2189 // read positive vector in the row space of the matrix 2190 2190 // such a vector induces a grading with respect to which the ideal is 2191 // homogen ous2191 // homogeneous 2192 2192 2193 2193 input>>format_string; … … 2284 2284 clock_t start, end; 2285 2285 2286 // construct homogen ous term ordering2286 // construct homogeneous term ordering 2287 2287 term_ordering w(variables, hom_grad, W_REV_LEX, HOMOGENEOUS); 2288 2288 … … 3064 3064 /////////// computation and output (second part) ////////////////////////// 3065 3065 3066 // distinguish 3 cases to verif iethe consistency of the vector dimension3066 // distinguish 3 cases to verify the consistency of the vector dimension 3067 3067 // and the number of variables 3068 3068 … … 3381 3381 ifstream _new(NEW_COST); 3382 3382 3383 // verif ieexistence of files3383 // verify existence of files 3384 3384 3385 3385 if(!old) … … 3716 3716 } 3717 3717 3718 // Now we can verif ieconsistency of both files with respect to the number3718 // Now we can verify consistency of both files with respect to the number 3719 3719 // of weighted variables: 3720 3720 -
IntegerProgramming/LLL.h
r1291fb r1a3778 3 3 // This file contains the implementation of two special variants of the 4 4 // LLL-algorithm. 5 // For further expla inations see the book of Henri Cohen, A Course in5 // For further explanations see the book of Henri Cohen, A Course in 6 6 // Computational Algebraic Number Theory. 7 7 -
IntegerProgramming/binomial.h
r1291fb r1a3778 111 111 short error_status() const; 112 112 // Returns _number_of_variables iff _number_of_variables<0 113 // (this is the "err ror flag").113 // (this is the "error flag"). 114 114 115 115 … … 123 123 // Access operator for reading exponent_vector[i] 124 124 // (cannot be used to overwrite exponent_vector[i]); 125 // no range ch ack on i!125 // no range check on i! 126 126 127 127 -
IntegerProgramming/list.cc
r1291fb r1a3778 58 58 // - The end_dummy guarantees that the deletion method of the simply linked 59 59 // list works: Deletion is done by copying the next element to the actual 60 // position and then deleting the original, see below for an expla ination.60 // position and then deleting the original, see below for an explanation. 61 61 // This would cause problems when deleting the last element; then the 62 // next-pointer of the prece eding element would reference freed memory62 // next-pointer of the preceding element would reference freed memory 63 63 // (it cannot be manipulated, is unknown). So the end_dummy as an 64 64 // artificial last element avoids this problem. … … 388 388 // .. and finally inserting bin at the old place 389 389 // Remember that we cannot insert a new element between the referenced 390 // element and its prece eding (we do not know the preceeding element)390 // element and its preceding (we do not know the preceding element) 391 391 iter->entry=&bin; 392 392 iter->done=FALSE; … … 430 430 // .. and finally inserting bin at the old place 431 431 // Remember that we cannot insert a new element between the referenced 432 // element and its prece eding (we do not know the preceeding element)432 // element and its preceding (we do not know the preceding element) 433 433 iter->entry=&bin; 434 434 iter->next=aux; … … 1094 1094 1095 1095 // When deleting or extracting an element of a simply linked list, the 1096 // next-pointer of the previous element cannot be manipulated (is unk onwn!).1096 // next-pointer of the previous element cannot be manipulated (is unknown!). 1097 1097 // So deletion must be done by copying the next element to the actual position 1098 1098 // and then deleting the original. Notice that only pointers are copies, never -
IntegerProgramming/matrix.cc
r1291fb r1a3778 347 347 348 348 // determine the start vector, i.e. the one with least zero components, but 349 // smallest possible (euclid ian) norm349 // smallest possible (euclidean) norm 350 350 int min_index=-1; 351 351 for(int i=0;i<_kernel_dimension;i++) … … 397 397 398 398 399 // STEP 3: Can a fur hter zero component be "eliminated"?399 // STEP 3: Can a further zero component be "eliminated"? 400 400 // If this is the case, find a basis vector that can do this. 401 401 -
IntegerProgramming/matrix.h
r1291fb r1a3778 5 5 // problem. It offers facilities to convert a two-dimensional integer array 6 6 // into a matrix and to read a matrix from an input file. 7 // Fur hermore, some special routines needed by the IP-algorithms are7 // Furthermore, some special routines needed by the IP-algorithms are 8 8 // implemented: 9 9 // - the computation of a lattice basis for the integer kernel via the LLL … … 106 106 107 107 int row_number() const; 108 // Retu ns the row number.108 // Returns the row number. 109 109 110 110 int column_number() const; -
IntegerProgramming/term_ordering.h
r1291fb r1a3778 21 21 // separate function instead of doing it in the constructors. 22 22 23 // For the same reasons as mention ned in the binomial class, frequently23 // For the same reasons as mentioned in the binomial class, frequently 24 24 // used operations on Integer vectors do not perform range checks. Nor do 25 25 // they check if an error has occurred (i.e. control the "error flag", see … … 67 67 // homogeneous one (i.e. the weighted part), else to FALSE. The standard 68 68 // setting is FALSE. 69 // The routine compare_to_zero is faster if the term ordering is homogen ous.69 // The routine compare_to_zero is faster if the term ordering is homogeneous. 70 70 // It would be safer and more natural to take this flag as a member of 71 71 // the ideal class; this would, however, require many supplementary … … 78 78 term_ordering(const BOOLEAN& homogeneous=FALSE); 79 79 // Sets weighted_block_size and elimination_block_size to zero. 80 // With this default con tructor, the term ordering can be taken as a member80 // With this default constructor, the term ordering can be taken as a member 81 81 // of another class (the ideal class in our case). 82 82 … … 175 175 // actual term ordering. The comparison of its two monomials is done 176 176 // according to the binomial data structure: 177 // Instead of comparing explicit ely two monomials, the Integer vector177 // Instead of comparing explicitly two monomials, the Integer vector 178 178 // corresponding to their difference is compared to the zero vector. 179 179 // The function returns
Note: See TracChangeset
for help on using the changeset viewer.
