Parent Directory
| 
Revision Log
| Sticky Revision: |
Reorganising CONOPT binding so that building support for CONOPT is possible without it being installed.
Moving solvers to their own directory
Fixing <solver/conopt.h>
Moved all solvers to dynamically loaded modules currently in folder models/johnpye. Location of these files will ultimately change.
Changes to the way in which sovlers are registered, to facilitate dynamically-loaded solvers. Also split much of the 'solver' stuff from slv.c (in the system directory) out into new file solver/solver.c and added matching solver/solver.h. Solver IDs are now fixed-- they don't change, and are stored in a list instead of in an array.
Standardising formatting of 'if' and 'else' in slv9. Renamed VarStatus to InstanceStatus (so that relation status can also be reported). Added reporting of inactive-in-a-when relations (using the broken-link icon for the moment).
Eliminated linsol, slv0 and slv1: moved the original files to 'disused' and editing out all reference to them in solvers and related code (including some Tcl/Tk wrapper code)
Another one of these big refactorings. Split out 'system' directory from 'solver' directory. This will need more work but it's a start at getting the non-solver-specific code out separately.
Copyright dates
Removed requirement for CONOPT_BOUNDLIMIT to be defined (case where not ASC_WITH_CONOPT)
Fixed the bounding problem in Slv9. Added python test cases for all of the models in Vicente's thesis. Will now add these tests to buildbot.
Split slv_param.[ch] from slv.c and slv_common.h. Removed some lint
Added some more test cases for DAE problem analysis. Little bit of tidying up in the slv*.c files.
slv_get_status changed to return non-zero on failure. Tests are passing with the new IDA 'analyse' routine but still plenty of gaps.
Missed one (see prev)
Removed <compiler/*> dependencies in slv*.c where possible. Did some minor reformatting of slv9.c.
Huge reorganisation -- all mtx and lin files moved to base/generic/linear. Required many #include statements to be changed.
A few easily-fixed warnings dispelled
Got paranoid about turning off signal handling... added '#ifdef ASC_SIGNAL_TRAPS' anywhere that signal handling referenced. Signal handling is OFF by default now.
Fixed up some #includes in compiler .[ch] files. Switched instantiate.c to using 'asc_assert' instead of 'assert'. Added some missing GPL headers in C++ code. Silenced some slv3.c debug output. Switch void-return to int-return in slv9_presolve etc (slv9.c) Attemping to fix solvernotes.py for the commandline environment (browser==None) Removed redundant solve(SELF) in thermalequilibrium2.a4c. Some error reporting from addone_calc (extfntest.c). Expanded test size in extrelfor.a4c. Big rearrangement of bboxtest.c for top-down style. Fixed TestFreesteam.testintegrator, added end-value checks.
first attempt at merging with Ben's changes on the trunk
Changed over to ASC_NEW* for some solver memory allocation. Fixed up file headers. Change debug and error output to use new mechanism.
In slv9, made changes to keep CONOPT from complaining. CMSlv still not working as expected though. Decreased required version of Bison to 2.0. Switched search path for CONOPT on Linux to the CONOPT_PATH env var (LD_LIBRARY_PATH was being interfered with when ASC_DEV=1). Some other debug message changes.
Corrected syntax in testcmslv. Changed instance.cpp so that residuals are not called for logrels. Added CONOPT_BOUNDLIMIT to both slv8 and slv9. Changed limits for colsta in slv9 (needs checking)
Added support for dlopening of CONOPT. This means that we can distribute ASCEND without needing to maintain two versions.
Some more work to integrate the new CONOPT API with ASCEND. Also added ability to select different solvers from the PYGTK GUI
Enabled the LRSLV solver, so that CMSLV will be able to function correctly.
First work towards reinstating the CONOPT solver. So far, I've got it building and linking without errors, but haven't tested the resulting runtime.
Replaced some references to ascmalloc with ASC_NEW_ARRAY
Merged changes from DAE branch (revisions 702 to 819) back into trunk. This adds the Integration API to the ASCEND solver (in base/generic). Also provides pre-alpha support for 'IDA' from the SUNDIALS suite, a DAE solver. Many other minor code clean-ups, including adoption of new 'ASC_NEW' and friends (to replace 'ascmalloc') Added some very sketchy stuff providing 'DIFF(...)' syntax, although it is anticipated that this will be removed.
Adding ASC_DLLSPEC to all functions that are being used by Python interface. Also cleaned up some #ifdef header brackets and html-style comments inside doxygen comments. Renamed pygtk/interface/config.in to pygtk/interface/config.h.in and made this active again (for ASC_BUILDING_INTERFACE) use. Trying to catch error in ascpy.Library call with try/except, doesn't work though.
Restored autotools to working, parsers to typ_ and zz_, Fixed many missing initializations, many casting insanities that have been creeping in, many missing forward declarations in preparation for fixing external relations.
Normalised all #include statements so that files in the current directory are included as "localfile.h" and files in other directories are included as <directory/file.h> This is in accordance with the spec at http://gcc.gnu.org/onlinedocs/gcc-4.1.0/cpp/Include-Syntax.html#Include-Syntax
- Simplifying many 'error_reporter' calls with new macros:
ERROR_REPORTER_NOLINE and ERROR_REPORTER_HERE
- Adding some cygwin cases in the PyGTK build.
Changed from 'TEST expr' syntax to 'ASSERT expr' syntax. Corrected ConfigAscend ability to compile with CMSlv solver.
moving things to base/generic
Setting up web subdirectory in repository
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| john.pye@anu.edu.au | ViewVC Help |
| Powered by ViewVC 1.1.22 |