/[ascend]/trunk/base/generic/solver/conopt.c
ViewVC logotype

Log of /trunk/base/generic/solver/conopt.c

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 1539)

Revision 1075 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 9 03:15:50 2007 UTC (13 years, 6 months ago) by johnpye
File length: 9775 byte(s)
Diff to previous 919
Attempts to fix utilities/config.h and ASC_WITH_CONOPT issues with autotools build

Revision 919 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 6 04:48:59 2006 UTC (13 years, 8 months ago) by johnpye
File length: 9721 byte(s)
Diff to previous 917
Fixing bug #305 (CONOPT not working with testconopt.a4c).
Some effort to rearrange external 'solve' scripts, ongoing.
Note, relman_diff2 returns 0 on success, but relman_eval returns 1 on success!

Revision 917 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 2 21:34:59 2006 UTC (13 years, 8 months ago) by johnpye
File length: 8921 byte(s)
Diff to previous 897
Added some debug stuff to work on the on_load problem.

Revision 897 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 24 11:05:18 2006 UTC (13 years, 8 months ago) by johnpye
File length: 8823 byte(s)
Diff to previous 895
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.


Revision 895 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 24 00:12:34 2006 UTC (13 years, 8 months ago) by johnpye
File length: 8817 byte(s)
Diff to previous 843
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

Revision 843 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Sep 10 06:18:24 2006 UTC (13 years, 10 months ago) by johnpye
File length: 8754 byte(s)
Diff to previous 804
Changed over to ASC_NEW* for some solver memory allocation.
Fixed up file headers.
Change debug and error output to use new mechanism.

Revision 804 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 4 05:54:34 2006 UTC (13 years, 11 months ago) by johnpye
File length: 8874 byte(s)
Diff to previous 800
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.

Revision 800 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Aug 1 12:22:09 2006 UTC (13 years, 11 months ago) by johnpye
File length: 8704 byte(s)
Diff to previous 791
Fixed for CONOPT under Windows.

Revision 791 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 27 12:04:19 2006 UTC (13 years, 11 months ago) by johnpye
File length: 8443 byte(s)
Diff to previous 790
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.

Revision 790 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 27 07:33:45 2006 UTC (13 years, 11 months ago) by johnpye
File length: 7896 byte(s)
Diff to previous 789
Added support for dlopening of CONOPT. This means that we can distribute ASCEND without
needing to maintain two versions.

Revision 789 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 27 04:35:17 2006 UTC (13 years, 11 months ago) by johnpye
File length: 5544 byte(s)
Diff to previous 788
Working version of testconopt.a4c now. This model yeilds the solution given in the CONOPT tutorial.

Revision 788 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 27 03:17:54 2006 UTC (13 years, 11 months ago) by johnpye
File length: 5471 byte(s)
Diff to previous 783
CONOPT running with testconopt.a4c but seems to give the wrong answer still.

Revision 783 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jul 26 09:16:19 2006 UTC (13 years, 11 months ago) by johnpye
File length: 5421 byte(s)
Diff to previous 399
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.

Revision 399 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 31 08:52:57 2006 UTC (14 years, 3 months ago) by johnpye
File length: 17790 byte(s)
Diff to previous 103
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

Revision 103 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Dec 11 14:31:02 2005 UTC (14 years, 7 months ago) by jds
File length: 17804 byte(s)
Diff to previous 11
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).

Revision 11 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 13 16:45:56 2004 UTC (15 years, 8 months ago) by aw0a
File length: 17794 byte(s)
Copied from: trunk/ascend4/solver/conopt.c revision 10
Diff to previous 1
moving things to base/generic

Revision 1 - (view) (download) (as text) (annotate) - [select for diffs]
Added Fri Oct 29 20:54:12 2004 UTC (15 years, 8 months ago) by aw0a
Original Path: trunk/ascend4/solver/conopt.c
File length: 17794 byte(s)
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.

  Diffs between and
  Type of Diff should be a

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22