/[ascend]/trunk/ascend/system/relman.c
ViewVC logotype

Log of /trunk/ascend/system/relman.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 2351 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 6 02:02:41 2011 UTC (12 years, 4 months ago) by jpye
File length: 31104 byte(s)
Diff to previous 2349
Resolved memory leak with test/test solver_ipopt.formula.
Still some issues to overcome with regard to inactive relations, probably.
Some issue still occurring when attempting to run whole solver_ipopt suite in one go.

Revision 2349 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 6 00:30:17 2011 UTC (12 years, 4 months ago) by jpye
File length: 30973 byte(s)
Diff to previous 2323
Working on valgrind issues associated with asc_ipopt.c.
Suppressed error output in test_ascDynaLoad by assigning no-op error_reporter.

Revision 2323 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 15 06:35:43 2010 UTC (12 years, 5 months ago) by jpye
File length: 30932 byte(s)
Diff to previous 2322
Refactor some more stuff from 'utilities' into 'general' with goal that 'general' never refers to 'utilities'.

Revision 2322 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 15 06:12:36 2010 UTC (12 years, 5 months ago) by jpye
File length: 30940 byte(s)
Diff to previous 2130
Refactoring ascMalloc.h, mem.h to belong in 'general' with goal of having no references in 'general' to functions in 'utilities'.

Revision 2130 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 18 01:32:28 2009 UTC (13 years, 5 months ago) by mahesh
File length: 30942 byte(s)
Diff to previous 2018
Merging all changes from Mahesh's GSOC project.
svn merge -r2273:2671 svn://ascend.cheme.cmu.edu/ascend/code/branches/mahesh .
See http://ascendwiki.cheme.cmu.edu/User:Mnm87 for details.

Revision 2018 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Apr 29 03:38:10 2009 UTC (14 years, 1 month ago) by jpye
File length: 27269 byte(s)
Diff to previous 2011
Fixed compile for new header file locations <ascend/compiler/xxx.h> etc.

Revision 2011 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 28 08:58:48 2009 UTC (14 years, 1 month ago) by jpye
File length: 27129 byte(s)
Copied from: trunk/base/generic/system/relman.c revision 2010
Diff to previous 1791
Moving libascend components from #/base/generic into #/ascend

Revision 1791 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 19 08:18:14 2008 UTC (14 years, 11 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 27129 byte(s)
Diff to previous 1638
ipopt_eval_g...

Revision 1638 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 8 12:08:19 2007 UTC (15 years, 6 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 27118 byte(s)
Diff to previous 1636
Added CUnit test suite for 'compiler' module.
Added a couple of *very* preliminary tests.
Removed some debug output from packages.c
Fixed a #include missing from module.h.
Added a couple of missing #ifdef __cplusplus from test header files.
Added little bit of test code into relman_hessian_count (still active).


Revision 1636 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 24 13:04:05 2007 UTC (15 years, 7 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26887 byte(s)
Diff to previous 1547
IPOPT gets installed if built.
added relman_hessian_count placeholder.

Revision 1547 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 23 06:25:49 2007 UTC (15 years, 10 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26681 byte(s)
Diff to previous 1355
Fixed build of asc_ipopt.c. Small comment added in relman. IPOPT_LIB replaced by IPOPT_LIBS due to multiple linking requirement of that library.

Revision 1355 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 19 13:18:01 2007 UTC (16 years, 2 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26626 byte(s)
Diff to previous 1354
Fixed TestSolver failing case (linux only).
Silenced some debug output.

Revision 1354 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 19 02:06:01 2007 UTC (16 years, 2 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 27196 byte(s)
Diff to previous 1353
Fixed 'do_check' in PyGTK GUI.
Added black box direct solve, experimental.

Revision 1353 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 18 01:48:40 2007 UTC (16 years, 2 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26913 byte(s)
Diff to previous 1338
Removed some redundant #include statments.
Added some explanation of testtmy.a4c (although currently broken with IDA).


Revision 1338 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 10 12:35:56 2007 UTC (16 years, 2 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26916 byte(s)
Diff to previous 1337
REmoving some debug info

Revision 1337 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 10 12:33:15 2007 UTC (16 years, 2 months ago) by jpye
Original Path: trunk/base/generic/system/relman.c
File length: 26910 byte(s)
Diff to previous 1316
Added support for detection of boundary crossing in the IDA integrator.
Cleared up some code comments and formatting.

Revision 1316 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 5 07:22:21 2007 UTC (16 years, 2 months ago) by johnpye
Original Path: trunk/base/generic/system/relman.c
File length: 27849 byte(s)
Copied from: trunk/base/generic/solver/relman.c revision 1315
Diff to previous 1309
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.

Revision 1309 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 4 07:40:17 2007 UTC (16 years, 2 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27849 byte(s)
Diff to previous 1240
Added index checking for semi-explicit DAE systems.
Migrated error messages for mtx and linsolqr to the error_reporter mechanism.

Revision 1240 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 26 11:12:20 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27870 byte(s)
Diff to previous 1237
@!@#$#$%! working at last

Revision 1237 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 26 01:42:16 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27794 byte(s)
Diff to previous 1231
Fixed problem with sort order of diffvars vs sindex vs IntegratorSystem::y

Revision 1231 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 25 07:43:56 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27728 byte(s)
Diff to previous 1228
Reversing changes to relman.[ch] (they broke CONOPT)

Revision 1228 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 25 06:57:40 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27754 byte(s)
Diff to previous 1227
Added getParameter by name in SolverParameters.
Fixed up refences to signal-related header files.
Fixed up various warnings from -pedantic compilation.
Identified an apparent bug with RelationCalcGradient (unsafe version).
Added support for compilation of a standalone C++ program (idatest) in SCons build.

Revision 1227 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 25 00:27:14 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27728 byte(s)
Diff to previous 1221
Header rearrangement for relation_type.h

Revision 1221 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 24 13:33:06 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 27764 byte(s)
Diff to previous 1217
Implemented the DAE partitioning routine but am nowing tracking down a fiendish memory crash.

Revision 1217 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 13:10:26 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26341 byte(s)
Diff to previous 1211
Added integrator_ida_check_lists, it's showing up a problem 

Revision 1211 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 05:09:50 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26448 byte(s)
Diff to previous 1210
Fixed dependencies on dimen.h and fractions.h.

Revision 1210 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 04:25:51 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26506 byte(s)
Diff to previous 1183
Removed unnecessary #include <compiler.h>

Revision 1183 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 20 09:15:51 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26536 byte(s)
Diff to previous 1035
Huge reorganisation -- all mtx and lin files moved to base/generic/linear.
Required many #include statements to be changed.

Revision 1035 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 07:35:22 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26612 byte(s)
Diff to previous 1034
Softened error from bintoken.c
Improved error reporting in instantiate.c
Rearranged #includes in relation_util.[ch]
Changed to asc_assert in relman.c
Lots of fixed in slv3.c to get reporting of 'calc_ok' right.
Also some better error reporting from slv3.c.
Fixed usage info for error_reporter_tree_start().
Improved error/status reporting from bboxtest.c.
Set PyGTK GUI to correctly catch ::solve errors.
Improved reporting about when solver fails (diverged, inconsistent, exceeded time/iters)
Fixed TestBlackBox.testfail1 and TestBlackBox.testfail2.
Fixed type.cpp to throw errors when instantiation fails.

Revision 1034 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 4 05:37:55 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26576 byte(s)
Diff to previous 1031
Switch 'void slv_*' function to output a 0-on-success error flag.
Added some debug output to ensure that such output gets through.
Fixed TestBlackBox.testfail1 to work, using above changes.
Simulation::solve now throws an exception on failure (will need to modify PyGTK GUI accordingly)

Revision 1031 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 3 15:33:23 2007 UTC (16 years, 4 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26511 byte(s)
Diff to previous 979
Merging Ben's changes from trunk, changeset 1105 to changeset 1234.
This breaks Python test suite TestExtFn, so will need investigation.

Revision 979 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 20 14:34:16 2006 UTC (16 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26507 byte(s)
Diff to previous 919
Added simplified ASC_PANIC call that uses var-args, added throughout relation_util.c.
Fixed var_filter_t stuff in djex and fvex.
More assertions in integrator.c
Added output of initial state from lsode.c (hoping that's a good idea?)
Fixed output code from relman_diff2.
Added asc_panic_nofunc for non var-arg CPPs.
Disabled -O3 flag in building C++ API
Added __getitem__ and __getattr__ methods in Simuluation for simplified python syntax (eg M.x instead M.sim.x)
Integrator::analyse throws exceptions on error now.


Revision 919 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 6 04:48:59 2006 UTC (16 years, 6 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26631 byte(s)
Diff to previous 912
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 912 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 27 07:18:21 2006 UTC (16 years, 7 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26512 byte(s)
Diff to previous 909
Removed BBOXWHINE (replaced with some one-time-only warnings for the moment)
Added ExtMethodDestroyFn to allow 'user_data' associated with external methods to be destroyed.
Implemented the destroy fn through to 'extpy' module.
Added 'name' as an extra parameter in the user_data for extpy, to help with debug msgs.
Moved 'solvernotes' to a file of its own (was part of listnotes.py)
Added 'repaint' to GTK 'tools' menu (for debugging)
Added 'python.h' to top of library, type files (pygtk) to stop silly warnings.
Working on some diagnosing of problems as noted in Simulation::checkInstance.
Removed some old comments from namio.h and others.
Renamed 'blsys' to 'sys' in integrator.c.
Some work on fixing up the J*v function for IDA (not yet complete).
Added new 'destroyfn' parameter (as NULL) to all calls to 'CreateUserFunctionMethod'.

Revision 909 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 12:44:41 2006 UTC (16 years, 7 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26506 byte(s)
Diff to previous 908
Added finite-difference evaluation of gradients in blackboxes.
Some work on J*v evaluation with IDA.

Revision 908 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 10:18:53 2006 UTC (16 years, 7 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26430 byte(s)
Diff to previous 731
first attempt at merging with Ben's changes on the trunk

Revision 731 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 07:42:06 2006 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26899 byte(s)
Diff to previous 728
Removed some debug messages.
Fixed up return values for Integrators functions to comply with integrator.c API.

Revision 728 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 05:03:59 2006 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26869 byte(s)
Diff to previous 727
Removed some debug messages from external libraries stuff.
Fixed auto-sim stuff for files given with relative path on the commandline.

Revision 727 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 04:03:37 2006 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26861 byte(s)
Diff to previous 726
This change fixes the external relation evaluation! There are definite problems
with convergence but this may be due to tolerences being too fine in ASCEND compared
to freesteam.

Revision 726 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 3 14:30:26 2006 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26830 byte(s)
Diff to previous 725
Matrix evaluation of the jacobian is working now but there is something wrong
with the solver's view of the incidence matrix, or something, as it does
seem to be acting on the values it's receiving.

Revision 725 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 3 11:52:45 2006 UTC (16 years, 10 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26940 byte(s)
Diff to previous 718
Fixed a *stupid* bug with relation.c in CreateBlackBoxRelation...

Revision 718 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jul 1 05:28:17 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26934 byte(s)
Diff to previous 710
Fixed relman_diffs to make call to ExtRel_Diffs_RHS and _LHS (this is 
a bad hack though, just to get the old code working again).

Revision 710 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 29 08:53:37 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26484 byte(s)
Diff to previous 709
Added my so-called 'quick fix' to external relation processing.
Still need to pursue corruption of efunc->etype pointer, for some
reason.

Revision 709 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 28 16:28:57 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26216 byte(s)
Diff to previous 708
Monster commit!
Lots of recommenting and reorganising of external relations-related stuff.
Replaced a lot of ascmalloc and asccalloc calls with the new ASC_NEW* macros.
Fixed (?) the problem Art is having with icons in PyGTK.
Turned on -Wall in SConstruct and fixed up a stack of warnings.
Removed the redundant exit(2) from after Asc_Panic calls and added __attribute__((noreturn)).
Set doxygen to create callgraphs to level 2, updated doxyfile to version 1.4.7.
Fixed up building of extfntest.c.

Revision 708 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 27 07:34:31 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26896 byte(s)
Diff to previous 669
Replaced some references to ascmalloc with ASC_NEW_ARRAY

Revision 669 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 21 07:00:45 2006 UTC (16 years, 11 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26893 byte(s)
Diff to previous 430
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.

Revision 430 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Apr 4 07:18:41 2006 UTC (17 years, 1 month ago) by ben.allan
Original Path: trunk/base/generic/solver/relman.c
File length: 26809 byte(s)
Diff to previous 399
got rid of errant executable bits.

Revision 399 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 31 08:52:57 2006 UTC (17 years, 2 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26809 byte(s)
Diff to previous 216
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 216 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 25 02:12:20 2006 UTC (17 years, 4 months ago) by jds
Original Path: trunk/base/generic/solver/relman.c
File length: 26879 byte(s)
Diff to previous 122
Minor rework of jam system to stop relinking of libraries when sources not modified.
Minor tweaks to stem the tide of compiler warnings.

Revision 122 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 19 06:12:40 2005 UTC (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26879 byte(s)
Diff to previous 97
Refactoring all MAX, MIN, ABS calls to general/mathmacros.
Adding a GCC optimisation for these macros.

Revision 97 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 9 03:49:19 2005 UTC (17 years, 5 months ago) by jds
Original Path: trunk/base/generic/solver/relman.c
File length: 26847 byte(s)
Diff to previous 89
Minor fixes to:
 - continue killing compiler warnings on gcc & msvc 
 - start working on function/data pointer mismatches
 - documentation tweaks

Fixed ascMalloc.c memory logging problems.  This has not been tested on linux/unix.  If it fails to compile, please revert to the previous version and let me know.

Revision 89 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 7 15:44:43 2005 UTC (17 years, 5 months ago) by johnpye
Original Path: trunk/base/generic/solver/relman.c
File length: 26770 byte(s)
Diff to previous 11
Small changes to eliminate GCC warnings

Revision 11 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 13 16:45:56 2004 UTC (18 years, 6 months ago) by aw0a
Original Path: trunk/base/generic/solver/relman.c
File length: 26795 byte(s)
Copied from: trunk/ascend4/solver/relman.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 (18 years, 7 months ago) by aw0a
Original Path: trunk/ascend4/solver/relman.c
File length: 26795 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