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
Andreas Meyer
c51efe2626
replaced ccIncludeVerbatim by ccIncludeExampleCode, where appropriate
2006-08-09 14:19:50 +00:00
Andreas Meyer
b454b3febd
manual cleanup:
...
* .C ---> .cpp
* removed ../examples from paths
* moved some demo/example files out of doc_tex into their respective place
* now it should build properly, again
2006-08-07 16:43:09 +00:00
Andreas Fabri
10bebd9e5a
Fixed min max problem
2006-07-31 22:26:40 +00:00
Bernd Gärtner
ffff51ec51
quadobj format fix + nerw test case added
2006-07-18 14:35:27 +00:00
Bernd Gärtner
84e1ffac7e
another wrong path fix
2006-07-12 10:57:19 +00:00
Bernd Gärtner
5eb10120a0
wrong path fixes
2006-07-12 10:45:00 +00:00
Bernd Gärtner
6a114b6533
some remaining AUTOMATIC macros removed; minor testsuite fix
2006-07-11 14:18:59 +00:00
Bernd Gärtner
820a11c82d
QP_solver.C -> QP_solver_impl.h
2006-07-11 12:08:37 +00:00
Bernd Gärtner
6579a4c658
internal h-files moved to include/CGAL/QP_solver
2006-07-11 11:19:55 +00:00
Bernd Gärtner
708b5a07a0
added Bland pricing rule; fixed sign bug in unbounded direction
2006-07-11 10:08:37 +00:00
Andreas Fabri
c07a9c6dc5
changed .C to .cpp in examples
2006-07-09 19:40:04 +00:00
Bernd Gärtner
9259fc72f0
actual copies added
2006-06-29 17:56:03 +00:00
Bernd Gärtner
1ffd9d930d
symbolic links removed
2006-06-29 17:55:21 +00:00
Laurent Saboret
1f0a69733b
Fixed svn:keywords property
2006-06-23 13:56:01 +00:00
Bernd Gärtner
5ca47b2aee
fixed bug that led to wrong objective function values
2006-05-30 14:31:16 +00:00
Sylvain Pion
566dda4ad7
Replace symlink by copy.
2006-05-19 19:47:53 +00:00
Sylvain Pion
4074cb0e8b
\cgal -> \cgal\ .
2006-05-19 14:29:54 +00:00
Bernd Gärtner
f7147eeae8
README now also contains disclaimer
2006-05-12 13:21:36 +00:00
Bernd Gärtner
87c117db5c
somewhat elaborated these examples and marked them as experimental
2006-05-12 13:20:12 +00:00
Bernd Gärtner
984e23ccef
number of iterations reported in verbose mode
2006-04-20 14:59:17 +00:00
Laurent Saboret
87d65f75e3
Fixed svn properties of ASCII files (as defined by Maintenance/svn_client/config)
2006-04-18 12:42:52 +00:00
Laurent Saboret
312353dd51
Global fix of svn:executable property in trunk
2006-04-14 15:07:17 +00:00
Bernd Gärtner
3996d75c2c
adapted mentioning of script to cgal prefix
2006-04-04 13:41:59 +00:00
Bernd Gärtner
929d936ce5
made data_to_mps.C in /examples symbolic link to the one in /test
2006-03-30 07:33:19 +00:00
Bernd Gärtner
2637e71e3a
fixed vector size bug
2006-03-30 07:31:23 +00:00
Bernd Gärtner
a911c6340b
added cin-files to allow execution of examples in testsuite
2006-03-28 15:38:11 +00:00
Bernd Gärtner
362466495b
changed example/ data file naming for consistency
2006-03-27 15:56:10 +00:00
Bernd Gärtner
958ba8c6b1
added new examples that allow the solver to be used as standalone application
2006-03-27 15:47:36 +00:00
Bernd Gärtner
012321adf5
fixed unitialized variable warning
2006-03-27 09:23:31 +00:00
Sylvain Pion
209e525fb4
Force initialization of data members to prevent warning.
2006-03-25 12:23:10 +00:00
Bernd Gärtner
9f2fb1444f
- beautified output of test_MPS
...
- changed linear time index -> var_name mapping to constant time (MPS.C)
2006-03-16 11:44:46 +00:00
Andreas Fabri
5a49693dd4
Added whitespace between an int and a comma as workarounf for VC8 integer parse bug
2006-03-13 22:21:35 +00:00
Bernd Gärtner
65d8b53cfb
oops, forgot subdir
2006-03-10 12:43:36 +00:00
Bernd Gärtner
0aa2469e6c
warning fix
2006-03-10 12:29:00 +00:00
Bernd Gärtner
864e6389db
examples renamed, according to Andreas' request
2006-03-09 08:43:05 +00:00
Sylvain Pion
0e130994a7
- Fix for universal brain damage: "the the" -> "the".
2006-03-06 17:38:43 +00:00
Bernd Gärtner
e1005296e6
- fixed bugs in Value_by_index:
...
- avoid using bounds in standard form
- included denominator handling
- included new Variable_numerator_iterator in feasibility test
2006-03-06 14:22:18 +00:00
Bernd Gärtner
e520a96fa3
- removed old (not useful) variable iterators that go over the whole
...
set of working variables; instead, the same iterators now only go
over the original variables
2006-03-03 18:56:43 +00:00
Bernd Gärtner
27289d34c0
- added original_variables_numerator_iterator
...
and original_variables_value_iterator
- tested this new functionality as part of test_MPS.C
- adapted Trung's example to work with it and checked it in
2006-03-03 18:32:37 +00:00
Kaspar Fischer
69fb290fe6
- fixed typos
...
- added comment about "Derivatives: none"
2006-03-03 10:36:31 +00:00
Kaspar Fischer
165a7f2e3f
- fixed output of usage information to not harm the testsuite
2006-03-03 09:57:05 +00:00
Bernd Gärtner
293d0597d9
- added examples dir and fixed example from doc
2006-03-02 17:12:04 +00:00
Bernd Gärtner
2586165bee
- fixed bug in ratio test for positive mu
...
- derivative generation is suppressed upon comment in mps-file
- warnings seen in -o3 fixed
2006-03-02 15:57:23 +00:00
Kaspar Fischer
6c0479c7e0
- added some internal routines which are currently used by
...
master_mps_to_derivatives.C only
2006-02-28 19:55:14 +00:00
Kaspar Fischer
f4c848ac45
- added new derivative kind "free"
...
- fixed 'Generated-by' comment in shifted MPS-files
2006-02-28 16:57:30 +00:00
Kaspar Fischer
3126645e46
- better output
2006-02-28 15:10:29 +00:00
Kaspar Fischer
d5d49a27a7
- added important temporary note to README
2006-02-28 14:56:37 +00:00
Kaspar Fischer
c2faa96d72
- added README documentation for the QP_solver testsuite
2006-02-28 14:53:20 +00:00
Kaspar Fischer
a094a8a646
- moved PD_Primal_Random_n_r_s_d from "CGAL" to "additional" testsuite
2006-02-28 14:07:08 +00:00
Kaspar Fischer
65ee96564c
- fixed typo in create_test_solver_cin
2006-02-28 14:02:16 +00:00
Kaspar Fischer
f89943139d
- removed entries of the D matrix that are zero
2006-02-28 14:01:02 +00:00
Kaspar Fischer
501a06e5e2
- fixed bug in sanity check
2006-02-28 14:00:43 +00:00
Kaspar Fischer
730410c071
- latest version
2006-02-28 13:43:35 +00:00
Kaspar Fischer
d83b115b84
- updated to new directory structure (see previous revisions)
2006-02-28 13:42:29 +00:00
Kaspar Fischer
e56bb72cb5
- fixed typo in comment
2006-02-28 13:42:04 +00:00
Kaspar Fischer
ed1462437d
- fixed problems in filenames
...
- reorganized directory structure
2006-02-28 13:29:47 +00:00
Kaspar Fischer
d7691f1dd6
- now only nonzero entries of the D matrix are output to MPS-files
2006-02-28 12:21:11 +00:00
Kaspar Fischer
6542afbf6b
- fixed compiler warning problem
2006-02-28 12:19:14 +00:00
Kaspar Fischer
dcb9683c4e
- fixed bug in which usage info was not output when too few args were given
2006-02-28 12:19:00 +00:00
Kaspar Fischer
0ff6d2dcbc
- removed redundant #include
2006-02-28 10:27:37 +00:00
Kaspar Fischer
cbb15529f9
- fixed compatibility issues/bugs in create_test_solver_cin
...
- submitted CGAL test_solver.cin
2006-02-27 13:55:30 +00:00
Kaspar Fischer
e804b6f4c2
- added testcases (converted from old testsuite)
...
END OF TESTSUITE REWORK
2006-02-27 13:38:02 +00:00
Kaspar Fischer
c857ef7bc2
- added script create_test_solver_cin
2006-02-27 13:35:47 +00:00
Kaspar Fischer
97b506775a
- fixed bug ('m' instead of 'n')
2006-02-27 12:58:16 +00:00
Kaspar Fischer
4c22071657
TESTSUITE REWORK (CONTINUED)
...
In case you want to check out the old testsuite, check out revision 28811.
2006-02-27 11:14:16 +00:00
Kaspar Fischer
650f208b12
BEGIN OF TESTSUITE REWORK
...
In case you want to check out the old testsuite, check out revision 28811.
2006-02-27 10:57:16 +00:00
Kaspar Fischer
93a03c90f9
- fixed return code
2006-02-24 15:19:49 +00:00
Kaspar Fischer
f924ba1920
- added master_mps_to_derivatives.C
...
- added CGAL header to data_to_mps.C
- QMATRIX section is only output if D is nonzero
- added function problem_name() to MPS.h
2006-02-24 15:16:30 +00:00
Kaspar Fischer
0da3b304c6
- fixed bug in MPS-output where "COLUMNS" was missing in the output
2006-02-24 10:19:34 +00:00
Kaspar Fischer
3a61406ded
- data_to_mps does not require command line arguments anymore
2006-02-24 10:13:23 +00:00
Kaspar Fischer
4bb3f106f0
(- more to previous revision)
2006-02-24 10:06:06 +00:00
Kaspar Fischer
c0bebdc3c4
- name change data2mps to data_to_mps
2006-02-24 10:02:53 +00:00
Kaspar Fischer
7dd4a84585
- finished MPS-output routine (and with this also data2mps)
2006-02-23 17:36:59 +00:00
Kaspar Fischer
69117c5acf
- is_linear() now only returns true if D is nonzero; so far, whenever D was
...
present, is_linear() returned false
2006-02-23 15:35:05 +00:00
Kaspar Fischer
3364166411
- added feature to test_MPS to output the names of the variables as they occur
...
in the MPS file
2006-02-23 15:17:22 +00:00
Kaspar Fischer
f004c9253f
- fixed Maple/encodeProblem to output the MPS-files from the testsuite to
...
QMATRIX-format (which CPLEX understands) instead of our DMATRIX-format
2006-02-23 14:46:21 +00:00
Kaspar Fischer
2f428046c2
- fixed typo in comment
2006-02-23 14:14:40 +00:00
Kaspar Fischer
53f4fa1223
- does not assume anymore that a "Number-type: " comment is present in the MPS
...
file; if none is there, floating-point input is assumed
2006-02-23 13:50:16 +00:00
Kaspar Fischer
80f5874609
- added initial (and incomplete) converter utility (only parser implemented)
2006-02-23 13:38:25 +00:00
Kaspar Fischer
7a9348602e
- fixed typos
2006-02-21 17:54:27 +00:00
Kaspar Fischer
e184d87ec1
- reverted unintended removal of assertion
2006-02-21 17:44:59 +00:00
Kaspar Fischer
fff7f6a07e
- fixed validity check (unboundedness)
2006-02-21 17:37:34 +00:00
Kaspar Fischer
90b3b616a0
- fixed bug in encodeProblem (shifted instances were not really translations)
...
- added another testcase for the unboundedness validity check
2006-02-21 17:37:14 +00:00
Kaspar Fischer
662b8e87aa
- solver now provides routine mu_j(int j) to the pricing strategies which
...
computes the exact mu_j in both the standard form and nonstandard form case
- fixed bug in ratio_test_1__t_j() where mu_j was not correctly computed for
problems in nonstandard form
2006-02-21 13:27:43 +00:00
Kaspar Fischer
7a42e51754
- fixed some typos in commentes
2006-02-20 15:26:07 +00:00
Kaspar Fischer
6fae29186c
- moved QP_solver.C from CGAL/ to CGAL/QP_solver/
2006-02-20 14:55:55 +00:00
Kaspar Fischer
1033cbada1
- added a test in create-testsuite that checks whether all testcases needed for
...
the testsuite are really submitted to the SVN repository
- fixed documentation of testsuite in README
2006-02-20 14:25:48 +00:00
Kaspar Fischer
1b666993c1
- fixed bug in validity check (optimality of auxiliary problem): the previous
...
revision only checked the KKT conditions for the problem in standard form
- added simple (and inefficient) class Bnd that represents a possibly infinite
bound; the class is used in the validity check
2006-02-20 14:00:28 +00:00
Kaspar Fischer
2fe2afb760
- (uups, dropped some statement in the previous commit...)
2006-02-16 15:10:36 +00:00
Kaspar Fischer
e3abce195b
- fixed bug: the upper-bounding mu_j(j) should do a LP-like mu_j(j) if j is a
...
slack variable
- fixed bug in which the partial pricing called mu_j(j) for a variable j which
is basic (the reason is that the active set MAY contain basic variables;
these were priced in previous revisions)
2006-02-16 14:59:56 +00:00
Kaspar Fischer
10de9dc6ed
- fixed bug in which several .svn/* files where included as test cases in the
...
testsuite
2006-02-16 14:32:19 +00:00
Laurent Saboret
db6a8f948c
Change CVS keywords to SVN style
2006-02-16 14:30:13 +00:00
Kaspar Fischer
c731057bbd
- fixed bug in which the upper-bounded version of mu_j() was never called
...
- fixed issue where the feasiblity check in update_1() was called at moments
where it need not hold
2006-02-16 13:26:41 +00:00
Kaspar Fischer
f98be94d6d
- prefixed atoi and exit with "std::"
2006-02-15 12:21:14 +00:00