Commit Graph

251 Commits

Author SHA1 Message Date
Bernd Gärtner 6ba585a7b1 - forgot that file (it's only a changed comment) 2007-04-12 14:51:36 +00:00
Bernd Gärtner 62f0ca4473 - manual:
- added QP_solution page (the fat one)
	- added package description and image
	- some minor revisions
- code:
	- renamed some QP_solution methods to make them more accessible
2007-04-12 14:50:16 +00:00
Bernd Gärtner 4214cf44b4 - simplification: some redundant models removed 2007-04-12 07:48:28 +00:00
Bernd Gärtner a2712eb429 - various refactorings:
- mps reader is now derived from a model that allows to set
	  up and manipulate a program entrywise
	- old copying models removed
        - free models removed (they are utterly useless)
        - a() -> get_a() etc.
        - the solver can now solve problems with no variables :-)
- manual:
        - added maker pages
        - adapted to above changes
2007-04-11 15:48:19 +00:00
Bernd Gärtner eacca3f01d - the order of QMATRIX entries changed 2007-04-11 07:12:26 +00:00
Bernd Gärtner 6a7eed25d7 - switched back to nonverbose test_MPS 2007-04-03 17:57:59 +00:00
Bernd Gärtner 05bb54506f - made certificate examples work directly with the iterators rather
than copying their ranges
2007-04-03 17:49:14 +00:00
Bernd Gärtner 8e41774983 - added performance note to solving functions doc
- changed unbounded direction w so that x + tw is the unbounded ray
- aded certificate iterators to QP_solution
- added example programs that demonstrate the certificates
- fixed examples so that 2D instead of D is given
2007-04-03 14:54:38 +00:00
Bernd Gärtner ec52f86fd3 - some fixes in models
- added doc for solve and print functions
2007-04-03 11:55:36 +00:00
Bernd Gärtner 2a841b7f4a - minor fix 2007-04-03 10:13:10 +00:00
Bernd Gärtner d4939fd7bf - some explanation added to copying models 2007-04-03 10:10:35 +00:00
Bernd Gärtner 4cbbedf839 - missing const added
- first_qp fixed to provide 2D instead of D
2007-04-03 10:05:43 +00:00
Bernd Gärtner 9d3b0d0327 - added sparse MPS readers
- documented MPS format
2007-04-03 10:04:21 +00:00
Bernd Gärtner a971b7db8a - sparse mps readers added
- minor fix in print routine
- output for mps instances deleted (it's replaced by the general template)
2007-04-03 07:14:06 +00:00
Bernd Gärtner 6b13cebe20 - maintainer file 2007-04-02 19:21:54 +00:00
Bernd Gärtner 0b043a97e6 - committed test_random_qp; it now also solves the programs using
their NQP, LP, NLP interfaces
2007-04-02 17:52:18 +00:00
Bernd Gärtner 2d225d4184 - added doc for QP_models 2007-04-02 14:05:46 +00:00
Bernd Gärtner 9f5e838e6f - added a farkas-Lemma proof of infeasibility
- added test with random small QP's
- fixed some bugs discovered by this:
   - output routine for programs is now printing symmetric D
   - internal comparison routine is now ignoring bound value if it
     was specified as infinite
   - fixed sign error in subrotuine of ratio_test
   - removed constant term from consideration in phase I
2007-04-02 10:01:50 +00:00
Bernd Gärtner f0ebdcf4af - fixed tesuite so that filtered pricing strategies are only used
if input type is double
- *always* run the tests if input type is rational, since file types
  double/int/rational all convert to it
2007-03-30 18:25:09 +00:00
Andreas Fabri c7e831b9ac Removed unused arguments 2007-03-27 07:49:33 +00:00
Bernd Gärtner 290d0e7e1f - fixed all occurrences of qp_A[i][j], qp_D[i][j] (qp_A[i], qp_D[i] are in
general only convertible to the appropriate iterator types, and so the
  above will not work. The fix is to use (*(qp_A + i))[j]
2007-03-23 10:57:07 +00:00
Bernd Gärtner 51b3b30f78 - copying models now have default/copy-constructors and assignment ops
- test (and fixed) access to upper-diagonal entries in D
- MPS read/write disagreement now only triggers warning (small differences
  may be ok if floating point numbers are used)
2007-03-23 10:20:03 +00:00
Bernd Gärtner 8a7a6a899e - internal qp_D now represents 2*D 2007-03-22 13:45:07 +00:00
Bernd Gärtner a82ea6875e Is_in_standard_form -> Is_nonnegative (like in interface) 2007-03-22 10:10:57 +00:00
Bernd Gärtner 00657e993b - is_valid made private and integrated into QP_solver constructor (it may use
QP data that are no longer available after the constructor call)
- fixed copying models to only copy entries of D on/below the diagonal
- fixed are_equal_qp function to only access entries of D on/below the diagonal
2007-03-22 09:41:04 +00:00
Joachim Reichel 35b0f3bb6c update FSF address 2007-03-20 19:24:29 +00:00
Bernd Gärtner 5d9a94c31a - uninitialized variable fix 2007-03-20 10:38:39 +00:00
Bernd Gärtner 48b08c927a - added new models that copy the data and integrated them into testsuite 2007-03-19 17:02:50 +00:00
Bernd Gärtner 3992a4840c - integrated MPS print function into test suite
- cleaned up QP_functions by putting internal stuff into nested namespace
2007-03-19 14:46:14 +00:00
Bernd Gärtner e527fa4c0a - U_iterator::value_type -> iterator_traits<U_iterator>:value_type
- various warnings fixed
2007-03-17 23:18:53 +00:00
Michael Hemmer 854ea80b4b rm use of CGALi::Is_field etc
replaced by use of Algebraic_category tag
2007-03-12 17:34:47 +00:00
Sylvain Pion 05840a8f17 Cleanup of white spaces and empty lines also under examples/*/*.h. 2007-03-10 16:45:36 +00:00
Sylvain Pion 6fb5cb906b Remove trailing white spaces and end of lines.
(using : perl -pi.bak -e 's/\s+$/\n/' */examples/*/*.cpp )
2007-03-10 14:59:41 +00:00
Bernd Gärtner 1475ebf022 functor moved from dependent classes to QP_solver 2007-03-05 14:44:06 +00:00
Bernd Gärtner 4eb4184763 moved the trivial test file for Menelaos' broken setup to where it belongs 2007-03-02 11:52:35 +00:00
Bernd Gärtner 6b5aaed1a0 - fixed "changes meaning" error 2007-03-01 19:26:54 +00:00
Bernd Gärtner d03d1ccaf4 - avoid division by zero gcd in Quotient_normalizer 2007-03-01 16:47:18 +00:00
Bernd Gärtner f3d98caccb - some further warning fixes 2007-02-23 09:08:12 +00:00
Bernd Gärtner 513678a4a6 - some more warning fixes 2007-02-22 10:15:03 +00:00
Bernd Gärtner b59d73c78f - fixed warnings (mainly unused variables in functions overloaded by tags) 2007-02-22 10:07:00 +00:00
Bernd Gärtner 0e05f24b44 - C-files removed from test 2007-02-16 15:59:47 +00:00
Bernd Gärtner 5a76699d6d - removed C-files under include/CGAL 2007-02-16 15:40:25 +00:00
Bernd Gärtner 6039e402f1 - some warning fixes, plus minimal testfile that breaks debugged platform 2007-02-16 11:56:15 +00:00
Bernd Gärtner 010463a038 - went from a[i] to *(a+i) to please debugged g++, but don't understand
the actual problem
2007-02-15 14:21:44 +00:00
Bernd Gärtner 1ecc6a24f2 - redundant friend removed; iterators now returned as "const Iterator" in the
hope of pleasing Menelaos' debugged g++ platform
2007-02-13 12:18:05 +00:00
Andreas Fabri 4732722fc0 Moved captions below figure 2007-02-13 11:44:18 +00:00
Bernd Gärtner 7bbcbc2f31 fixes of small errors detected on various platforms 2007-02-12 08:41:50 +00:00
Bernd Gärtner 0a4fa9fa15 examples cleaned up and fixed 2007-02-08 17:57:45 +00:00
Bernd Gärtner 29bb3bfa24 QP_solver testsuite improved and adapted to Algebraic_foundations 2007-02-08 15:45:01 +00:00
Sylvain Pion fb8595b94e Cleanup : remove ancient CGAL_PROTECT_* macros.
It's the compiler's job to optimize preprocessing time.
2007-01-24 17:16:05 +00:00
Sylvain Pion 40d0fb8d35 Fix all "align=center" in <img> by "align=middle". 2007-01-13 21:49:03 +00:00
Laurent Saboret 9d0d302a87 Fixed svn properties of whole trunk 2006-12-18 09:37:55 +00:00
Michael Hemmer 0257a65d7b replaced:
CGAL::exact_division(..) -> CGAL::integral_division
2006-11-17 08:56:52 +00:00
Michael Hemmer 085f9c5144 CGAL::exact_division -> CGAL::integral_division 2006-11-06 15:51:58 +00:00
Bernd Gärtner a949180978 introduced cast of qp_A[j] to A_column for cases where we get a proxy only 2006-11-01 11:57:09 +00:00
Bernd Gärtner aeb1213f4c - Free models added;
- figures/program for closest point in intersection of halfspaces
2006-10-27 14:07:45 +00:00
Bernd Gärtner 9928a8dc81 non-working boost::transform_iteratoxr 2006-10-24 15:34:11 +00:00
Bernd Gärtner ec5e0b2e00 switched to Kernel_traits<Point_d> to find out the ring type 2006-10-24 09:57:02 +00:00
Bernd Gärtner 1d6da1df10 switched to Cartesian in examples 2006-10-21 17:06:52 +00:00
Bernd Gärtner 43d3e1b6bc important variables doc 2006-10-21 17:02:31 +00:00
Bernd Gärtner 3726467e19 refactoring1 2006-10-21 16:00:32 +00:00
Bernd Gärtner 503940b105 point in convex hull example added (examples+doc) 2006-10-21 15:25:32 +00:00
Bernd Gärtner 367cb5e805 prepared next section in user manual 2006-10-19 20:36:40 +00:00
Bernd Gärtner d1c7c0d1f0 next user manual round 2006-10-19 20:07:04 +00:00
Bernd Gärtner b1994690c6 first part of usr manual; renamed functionality (QP->Quadratic_program...) 2006-10-19 17:47:58 +00:00
Andreas Meyer 645b9711d2 manual "bug"fixes 2006-10-17 13:15:01 +00:00
Bernd Gärtner 56353bec11 new tex files 2006-10-17 12:51:14 +00:00
Bernd Gärtner 968b8cc6f2 first doc version 2006-10-17 12:41:03 +00:00
Bernd Gärtner 3099eb48ff further renaming 2006-10-05 14:11:35 +00:00
Bernd Gärtner 0ddc67e0d7 renamed Optimisation_ref to QP_solver_ref 2006-10-05 14:10:51 +00:00
Bernd Gärtner 100bed9764 - minor documentation fix (c -> c_aux in is_sol_opt_for_aux_problem()) 2006-09-28 18:32:44 +00:00
Bernd Gärtner af94b11eb7 - ET/Quotient<ET> access to variable values/certicficates 2006-09-28 17:32:25 +00:00
Bernd Gärtner 561f2650f3 - introduced iterator for optimality certificate; the validity check
is using it now
2006-09-28 16:50:59 +00:00
Bernd Gärtner 6a05b09d69 - Unbounded_direction_iterator refactored; it now uses the
Transform_diff_const_iterator
2006-09-28 16:04:06 +00:00
Bernd Gärtner 68fc833cb5 - Is-symmetric tag removed; now all input is assumed to be symmetric.
Reason: the tag is unecessary, and allowing non-symmetric input only
  allows the user to enter redundant information
2006-09-28 14:29:33 +00:00
Bernd Gärtner a52c3881b6 - tag "Has_equalities_only_and_full_rank" removed; this is now handled
dynamically in the code. Reason: this tag is difficult to explain to
  the user, does not have any effect on the interface, and is not very
  costly to dispatch dynamically
2006-09-28 10:30:04 +00:00
Bernd Gärtner 631f1560f2 - vector O (original variable indices) removed and replaced by
proper iterator
2006-09-26 11:43:15 +00:00
Bernd Gärtner cb9694e886 - old internal type Double removed (Gmpzf takes over) 2006-09-26 10:07:07 +00:00
Bernd Gärtner 191f397d13 - basic interface for QP_solution enhanced; interface types and names
are now consistently only introduced in QP_solution, while the virtual
  functions in QP_solver_base are implementation-centered
2006-09-26 09:54:39 +00:00
Bernd Gärtner e1ec6bd6af - in derivatives creation, changed order of mps-reading: int, double, rational 2006-09-26 08:24:04 +00:00
Bernd Gärtner 49cac0da8b - removed special handling of Gmpq from QP_models, since the read-from-float
capability is now available in Gmpq.h
2006-09-19 14:30:56 +00:00
Bernd Gärtner 2898e47b44 put test_solver output under version control to allow regression testing 2006-09-18 12:10:55 +00:00
Bernd Gärtner 6a21496393 - added sparse representation and handling of LP to MPS reader; make_zero_D is removed 2006-09-16 19:12:07 +00:00
Bernd Gärtner aff6bd05a5 - made first version of QP_solution
- refactored QP_solver to have missing types / iterators from QP generated
- added normalization of variable values / solution
2006-09-14 16:46:51 +00:00
Bernd Gärtner f9ff2cfb36 - added make_qp function (more will follow: make_lp, make_nonnegative_lp,...)
- moved write_MPS out of QP_from_mps and made general
- introduced QP_solution as ref-counted wrapper for QP_solver pointers
2006-09-13 21:10:11 +00:00
Bernd Gärtner 7464866235 - added QP models
- refactored QP_solver to separate the QP, the ET and the Tags
- got rid of MPS.h, MPS.C (integrated into QP_models)
- added QP_functions.h to test full rank of QP
- added QP_solver diagnostics for friends to access
- removed ET type from MPS reader (was only needed for rank test, and now
  I'm using the new QP function for that -> faster and cleaner)
2006-09-09 14:58:32 +00:00
Bernd Gärtner d0a6a430ce removed configurable row type, now CGAL::Comparison must be used 2006-09-05 12:32:25 +00:00
Bernd Gärtner 6d9fb3278d - adapted all pricing strategies to deal with nonstandard form
- made pricing of a single variable a method in base class QP_pricing_strategy 
- added missing pricing strategy notification in enter_and_leave_variable()
2006-09-05 11:45:44 +00:00
Bernd Gärtner 33cdafd438 - adapted to new type Gmpzf
- fixed some possible sources of ambiguity: all arithmetic ops now
  have both operands of the same type
2006-08-31 11:27:31 +00:00
Bernd Gärtner 0bd5d53953 replaced CGAL::Double by CGAL::MP_Float and removed all includes of Double 2006-08-25 14:06:31 +00:00
Bernd Gärtner 02144270f0 minor fix (initialization of constant term c0 was missing) 2006-08-25 08:34:32 +00:00
Bernd Gärtner 1d057b9e59 enhanced MPS parser. It can now handle
- NAMEs with spaces
	- RANGES 
	- RHS entry for objective row (means: constant term in obj func)
enhanced QP_solver. It can now handle a constant term in obj func
2006-08-24 14:12:24 +00:00
Bernd Gärtner 1a13222641 files updated from benchamrks repository 2006-08-24 13:31:32 +00:00
Bernd Gärtner b8b1810b58 - added some additional assertions
- in write_MPS, 0's are now omitted
- added routine to read floating-point number in decimal format from MPS
- fixed two bugs that didn't have any effect (yet)
- commented out some expensive checks / long outputs in example programs
2006-08-24 07:45:02 +00:00
Bernd Gärtner 4b97123f03 replace bad previous commit by correct fix (just comment out expensive check) 2006-08-17 13:41:20 +00:00
Bernd Gärtner 0839e8a90c added flag to suppress rank checking in MPS-reader (might be very slow) 2006-08-17 12:49:19 +00:00
Bernd Gärtner 4f7ee400d5 fixed MPS reader so that it can handle empty bound label 2006-08-17 11:31:47 +00:00
Andreas Fabri e3d2f8a410 fixed min/max problem 2006-08-17 08:56:49 +00:00
Bernd Gärtner 84141f531b added missing resize of dependent containers in z_replace_variable() 2006-08-15 15:00:59 +00:00
Bernd Gärtner 2f86e14527 bug fixed in removal of slack variable from basis 2006-08-14 12:55:21 +00:00