Parent Directory
|
Revision Log
Sticky Revision: |
Added some debug stuff to work on the on_load problem.
Adding 'NOTES' support to C++ interface. 'johnpye/thermalequilibrium2.a4c' is the example case. listnotes.py performs listing via a python external script method. annotation.h and annotation.cpp implement the C++ wrapper referenced by SWIG. library.{h,cpp} modified to provide access to the AnnotationDatabase. Typemapping modified in ascpy.i in attempt to get a more maintainable wrapping. Added annotation.cpp to build. Updated copyright header and formatting of notate.{c,h}. Improved ErrMsg_BracesEOF error message fn. Updated copyright header and formatting of braced.{c,h} Some misc debug output removed esp in simulation.cpp, conopt.c, importhandler.c.
Removed debug output (modelview.py) Fixed bug in diagnose.py with large blocks Removed debug output and improved error message in conopt.c Removed debug output in lsode.c Removed debup output in ascDynaload.c
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.
Fixed for CONOPT under Windows.
Moved 'SearchArchiveLibraryPath' into ascDynaLoad so that it can be shared between compiler/packages and solver/conopt. Changed debug messages in ospath. Fixed conopt to search for consub3 in $LD_LIBRARY_PATH or /usr/lib:/usr/local/lib by default on Linux (or %PATH% or c:\Program Files\ASCEND on Windows). Modified definition of testconopt so that some parameters can be varied via the interface.
Added support for dlopening of CONOPT. This means that we can distribute ASCEND without needing to maintain two versions.
Working version of testconopt.a4c now. This model yeilds the solution given in the CONOPT tutorial.
CONOPT running with testconopt.a4c but seems to give the wrong answer still.
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.
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
Bug fixes & killing more compiler warnings: - general/list.c - fixed AssertAllocatedMemory and AssertContainedMemory bugs. - added #include of ascPanic.h where necessary to compile with ALLOCATED_TESTS defined. - reworked utilities/ascDynaLoad to eliminate compiler warnings related to casting between data & function pointers. - switched utilities/ascEnvVar.c over to ascstrdup (had static ascstringcopy, which did the same thing). All regression tests passed on Windows and Linux (except pre-existing solver/slv_common issues).
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 |