/[ascend]/trunk/base/generic/compiler/instantiate.c
ViewVC logotype

Log of /trunk/base/generic/compiler/instantiate.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 968 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 18 05:49:00 2006 UTC (13 years, 2 months ago) by johnpye
File length: 384767 byte(s)
Diff to previous 956 , to selected 737
Added SCons tests to check SIGINT and to replace ascresetneeded (need replacement for this in Autoconf as well).
Removed debugging from createinst.c
Typo (text) in evaluate.c
Commented out redundant code in importhandler.c
Added signal handling in ExecuteCASGN.
Added missing ospath_free in ModuleSearchPath.
Exported InitSymbolTable, DestroySymbolTable in symtab (dubious)
Moved FPRESET macro out of ascConfig.h and into ascSignal.h
Added Asc_SignalHandler{Push,Pop}Default.
Added ASC_RESETNEEDED and HAVE_C99FPE macros in config.h.in.
Found the bug causing the SIGFPE in idakryx.a4c (raises a question about int/float division in modelling, I think)
Added system_destroy call in Simulation::~Simulation (dubious).

Revision 956 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 9 15:38:05 2006 UTC (13 years, 2 months ago) by johnpye
File length: 384413 byte(s)
Diff to previous 911 , to selected 737
Removed references to 'ASC_BIG_BUGMAIL' and 'ASC_MILD_BUGMAIL'
Disabled stream redirection functions (they were making testing difficult)
Re-wrote the main test-runner to permit specific tests to be run from the commandline (ongoing)
Disabled readln tests that required stream redirection.

Revision 911 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 13:44:58 2006 UTC (13 years, 3 months ago) by johnpye
File length: 384586 byte(s)
Diff to previous 910 , to selected 737
Removed a few more redundant debug msgs

Revision 910 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 13:35:25 2006 UTC (13 years, 3 months ago) by johnpye
File length: 384826 byte(s)
Diff to previous 909 , to selected 737
In instantiate.c, made new blackbox code tolerant of blackboxes that don't need initialisation.
Removed some debug output.
Expanded 'extfntest.py' a little bit, for ease of testing.
Converted 'blackbox is experimental' warnings to one-time-only.
Minor change to way that webbrowser is invoked under linux.

Revision 909 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 26 12:44:41 2006 UTC (13 years, 3 months ago) by johnpye
File length: 384591 byte(s)
Diff to previous 908 , to selected 737
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 (13 years, 3 months ago) by johnpye
File length: 384594 byte(s)
Diff to previous 881 , to selected 737
first attempt at merging with Ben's changes on the trunk

Revision 881 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 9 10:51:06 2006 UTC (13 years, 4 months ago) by johnpye
File length: 379408 byte(s)
Diff to previous 839 , to selected 737
Removed some debug output in importhandler.
Fixed aspect ratio on four bar linkage plot.
Fixed up dsg.a4c for consistency with dsg-transient library.

Revision 839 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 8 07:46:53 2006 UTC (13 years, 5 months ago) by johnpye
File length: 379408 byte(s)
Diff to previous 771 , to selected 737
Removed some debug output from cond_config.c
Added superposition test (beam2.a4c)
Fixed up problems in beam.a4c (ongoing).

Revision 771 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jul 14 04:31:54 2006 UTC (13 years, 7 months ago) by johnpye
File length: 379490 byte(s)
Diff to previous 759 , to selected 737
Removed some debug noise.
Minor changes to dsg models.

Revision 759 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 13 04:16:10 2006 UTC (13 years, 7 months ago) by johnpye
File length: 379485 byte(s)
Diff to previous 752 , to selected 737
Commenting and changes to deubg output. Some reformatting of ModifyBlackBoxRelationPointers.

Revision 752 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jul 12 02:50:54 2006 UTC (13 years, 7 months ago) by johnpye
File length: 378848 byte(s)
Diff to previous 737
Fixed bug with instantiation of 'outvars'.

Revision 737 - (view) (download) (as text) (annotate) - [selected]
Modified Wed Jul 5 12:36:29 2006 UTC (13 years, 7 months ago) by johnpye
File length: 378845 byte(s)
Diff to previous 732
DSG model converges, using 3 external functions :-)
Added more info in 'diagnose' varinfo and relinfo popups, plus tabstops in display.
Allowed parameters to be used with instantiation_error in instantiate.c.
Fixed up some error messages in bintoken.c.
Renamed 'newcalc_done' to 'evaluation_required' in rel.c.
Other minor changes to error messages and commenting.


Revision 732 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 4 14:40:17 2006 UTC (13 years, 7 months ago) by johnpye
File length: 378706 byte(s)
Diff to previous 716 , to selected 737
Added general-purpose text-information dialog to PyGTK interface.
Added reporting of clique of a variable to PyGTK GUI.
Changed 'fixable' and 'new bounds' to use the new dialog.
Removed 'set<...>' from ascpy.i (it wasn't working), changed to vector<...>.
Exported a couple of var incidences fns to the DLL/SO.

Revision 716 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jul 1 03:18:30 2006 UTC (13 years, 7 months ago) by johnpye
File length: 380350 byte(s)
Diff to previous 710 , to selected 737
Fixed up ExtRel_Evaluate_LHS (was not accessing the arglist correctly),
it seems pretty inefficient at the moment, but we'll persist.

Revision 710 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 29 08:53:37 2006 UTC (13 years, 7 months ago) by johnpye
File length: 380387 byte(s)
Diff to previous 709 , to selected 737
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 (13 years, 7 months ago) by johnpye
File length: 380345 byte(s)
Diff to previous 708 , to selected 737
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 (13 years, 7 months ago) by johnpye
File length: 380776 byte(s)
Diff to previous 707 , to selected 737
Replaced some references to ascmalloc with ASC_NEW_ARRAY

Revision 707 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 27 05:49:11 2006 UTC (13 years, 7 months ago) by johnpye
File length: 380775 byte(s)
Diff to previous 703 , to selected 737
Lots of tidying up in instantiate.c.
Fixed up some GPL headers.
Changed from 'solver_var' to 'factor' in extfntest.a4c.
Added test for AtomAssigned in extfunc.c.

Revision 703 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 26 14:04:49 2006 UTC (13 years, 7 months ago) by johnpye
File length: 385888 byte(s)
Diff to previous 694 , to selected 737
Turned off DEBUG_RELS
Fixed bug with system_build.

Revision 694 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 22 07:54:53 2006 UTC (13 years, 8 months ago) by johnpye
File length: 385882 byte(s)
Diff to previous 669 , to selected 737
Lots of tidying up to relation_util code. (Most commments but a 
little refactoring of repeated code chunks.)
Added 'IMPORT' to the Gedit syntax definition.
Added error_reporters in place of some console output.

Revision 669 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 21 07:00:45 2006 UTC (13 years, 8 months ago) by johnpye
File length: 385791 byte(s)
Diff to previous 569 , to selected 737
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 569 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 9 00:10:03 2006 UTC (13 years, 9 months ago) by johnpye
File length: 385786 byte(s)
Diff to previous 530 , to selected 737
Changing from 'tcltk98' to 'tcltk', in progress.

Revision 530 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 22 07:52:30 2006 UTC (13 years, 10 months ago) by johnpye
File length: 385793 byte(s)
Diff to previous 529 , to selected 737
Found the problem with the PyGTK interface: a too-long vsprintf. Changed to vsnprintf.

Revision 529 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 22 06:26:23 2006 UTC (13 years, 10 months ago) by johnpye
File length: 385711 byte(s)
Diff to previous 467 , to selected 737
Working of debugging the mysterious PyGTK bug. Seems to be coming from a wrong
char *filename in an error_reporter call from the DEBUG_RELS sections of the
compiler code.
Also renamed the WSEM and WSNM macros for clarity, removed unused file pointer.

Revision 467 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 17 03:18:06 2006 UTC (13 years, 10 months ago) by ben.allan
File length: 384864 byte(s)
Diff to previous 423 , to selected 737
Changed the syntax of import from
IMPORT id FROM id;
to
IMPORT id FROM "quoted/text/lib";
Writing external
METHOD calls via the EXTERNAL methname(arglist);
now works.

Against my better judgement in a few cases,
cleaned up the old EXT statement code from Abbott
to work in a typesafe manner. A better solution
is to get the CALL syntax working as defined in 
the grammar, but this takes a good deal more work
and meanwhile people want to get their phds...

Still some known bugs in relation_util.
I need to commit the test models that go with
the EXT statements. Fixed a bunch of lintish
compiler complaints. Don't try to solve external
models yet.


Revision 423 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 3 23:15:49 2006 UTC (13 years, 10 months ago) by ben.allan
File length: 384671 byte(s)
Diff to previous 399 , to selected 737
Fixed instatiation of blackbox (and probably glassbox)
relations, for poorly tested definitions of 'fix'.
Blackbox evaluation is still broken.

There seems to be some chaos around win32_lean_and_mean
in ascConfig.h

updated reconfig. setenv TKROOT /where/is/tk8.3dir before 
running and all is good.

Revision 399 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Mar 31 08:52:57 2006 UTC (13 years, 10 months ago) by johnpye
File length: 384575 byte(s)
Diff to previous 375 , to selected 737
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 375 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 15 06:35:50 2006 UTC (13 years, 11 months ago) by johnpye
File length: 385178 byte(s)
Diff to previous 373 , to selected 737
Removing some debug output

Revision 373 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 14 08:39:37 2006 UTC (13 years, 11 months ago) by johnpye
File length: 385172 byte(s)
Diff to previous 371 , to selected 737
Tidied up formatting in measures.a4l
Added GPL notice to cavity.a4c
Fixed up reconfig to turn OFF gcov testing by default.
Removed some debug output from typedef.c and instantiate.c and arrayinst.c.
Commenting changes in extinst.h.
Working on getting the buildbot working :-)

Revision 371 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 14 05:04:06 2006 UTC (13 years, 11 months ago) by johnpye
File length: 385167 byte(s)
Diff to previous 303 , to selected 737
Added some debug output related to external relations.
Added ./configure flags for relation debugging and compiler timing.
Removed some <!-- --> comments.

Revision 303 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 21 02:38:13 2006 UTC (14 years ago) by johnpye
File length: 384845 byte(s)
Diff to previous 222 , to selected 737
Documentation, indentation and debugging-message changes.

Revision 222 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 27 04:23:20 2006 UTC (14 years ago) by johnpye
File length: 384768 byte(s)
Diff to previous 190 , to selected 737
Updating for Jerry's new error_reporter syntax, bug #179

Revision 190 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 16 08:53:30 2006 UTC (14 years, 1 month ago) by johnpye
File length: 384768 byte(s)
Diff to previous 183 , to selected 737
- Simplifying many 'error_reporter' calls with new macros:
    ERROR_REPORTER_NOLINE and ERROR_REPORTER_HERE
- Adding some cygwin cases in the PyGTK build.

Revision 183 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 13 02:35:00 2006 UTC (14 years, 1 month ago) by johnpye
File length: 384854 byte(s)
Diff to previous 114 , to selected 737
Added 'FIX varlist' statement to ASCEND.

Revision 114 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 16 00:20:44 2005 UTC (14 years, 2 months ago) by jds
File length: 384770 byte(s)
Diff to previous 97 , to selected 737
Fixed various bugs & compiler warnings:
- numerous AssertAllocateMemory & AssertMemory() bugs
- converted strdup() calls to ascstrdup() (and ascfree())
- several minor (mostly VisualC) compiler warnings (old style declarations, assignment in conditional, ...)

Revision 97 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 9 03:49:19 2005 UTC (14 years, 2 months ago) by jds
File length: 384684 byte(s)
Diff to previous 89 , to selected 737
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 (14 years, 2 months ago) by johnpye
File length: 384551 byte(s)
Diff to previous 76 , to selected 737
Small changes to eliminate GCC warnings

Revision 76 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 5 17:31:00 2005 UTC (14 years, 2 months ago) by johnpye
File length: 384384 byte(s)
Diff to previous 62 , to selected 737
More error_reporter calls.
Removed some C++-unfriendly var names.
Removed some debug messages.
Turned off compiler timing and relation debugging.

Revision 62 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 30 05:53:20 2005 UTC (14 years, 2 months ago) by johnpye
File length: 383658 byte(s)
Diff to previous 11 , to selected 737
My first commit:
Added 'error_reporter' for standardised error reporting
Working on getting external functions running again
Also: issue 130, issue 68, issue 131, issue 89, issue 127, issue 138, issue 94.

Revision 11 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 13 16:45:56 2004 UTC (15 years, 3 months ago) by aw0a
File length: 383462 byte(s)
Copied from: trunk/ascend4/compiler/instantiate.c revision 10
Diff to previous 1 , to selected 737
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, 3 months ago) by aw0a
Original Path: trunk/ascend4/compiler/instantiate.c
File length: 383462 byte(s)
Diff to selected 737
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