Commit Graph

348 Commits

Author SHA1 Message Date
Alex Lin
9ddc786ace Split test sims and fun sims into separate directories.
Moved most of the rest of the sims to test.

refs #191
2016-02-23 16:19:30 -06:00
John M. Penn
cf0ac7a5a1 Add SIM_ball_default_data to the Consolidated Ball directory and also add the required .d files. refs #191 2016-02-23 15:36:30 -06:00
Alex Lin
0144cc121a Split test sims and fun sims into separate directories.
Moved more sims into the test directory.

refs #191
2016-02-23 14:38:49 -06:00
Alex Lin
0c84b8ad08 plit test sims and fun sims into separate directories
Moved SIM_events, test_dp, test_dr, and abstract.

refs #191
2016-02-23 13:48:59 -06:00
John M. Penn
45e515cdb3 Consolidate the C Ball sims into one directory. refs #191 2016-02-23 12:03:13 -06:00
John M. Penn
9321595d2c Merge branch 'master' of https://github.com/nasa/Trick 2016-02-23 11:45:28 -06:00
John M. Penn
51447119b4 Consolidate all of the Cannon sims into one directory. refs #191 2016-02-23 11:44:18 -06:00
Alex Lin
cf4bbfdfe8 Split test sims and fun sims into separate directories.
Moved the 2 thread directories.

refs #191
2016-02-23 10:46:38 -06:00
Alex Lin
90fd0ff9f8 Split test sims and fun sims into separate directories.
Moved SIM_test_ip and a couple of other sims that depend on the same model set
to a new test directory.  I'm doing a couple of sims at a time.

refs #191
2016-02-23 10:23:55 -06:00
John M. Penn
950e319c1b move Satellite models to SIM_satellite and fix graphics makefile 2016-02-22 17:48:06 -06:00
John M. Penn
0a40189388 move parachute models to SIM_parachute and fix up S_overrides.mk 2016-02-22 12:41:20 -06:00
John M. Penn
486cc10784 mv helios models to SIM_sun/models/Sun 2016-02-22 12:22:27 -06:00
John M. Penn
fc79d7a36d Merge branch 'master' of https://github.com/nasa/Trick 2016-02-22 12:01:30 -06:00
John M. Penn
9e481703a1 Move the Wheelbot models to the SIM_wheelbot directory 2016-02-22 11:59:11 -06:00
Alex Lin
34a71e76ed Add Two Wheeled Electric Robot Sim
Added .gitignore file for built files.

refs #185
2016-02-22 09:55:12 -06:00
Alex Lin
2c5a46a8bc Trick::MemoryManager::add_attr_info improperly removes the const keyword
Changed the search from "const" to "const " because we're intersted in
removing the const keyword preceding a type name.

refs #184
2016-02-22 09:52:28 -06:00
Derek Bankieris
912778423b Fix Sniffer to use the new binary names, which are prepended with trick- 2016-02-22 09:42:22 -06:00
John M. Penn
da08efe546 Fixes #185 Add SIM_wheelbot 2016-02-18 16:14:44 -06:00
Alex Lin
39868aba46 Functions with enumerated default arguments cause bad python code to be generated
OK, all the previous checkins were the wrong way to fix this issue.  The SWIG
compactdefaultargs feature and the shadow feature clash for our DRBinary class.
I turn off compactdefaultargs for the DRBinary class, leaving it on for
everything else.

refs #176
2016-02-18 11:04:07 -06:00
Alex Lin
446fa129d4 Revert "Functions with enumerated default arguments bad"
This reverts commit 20dc7b1386.
2016-02-18 10:59:37 -06:00
Alex Lin
4ab940a691 Revert "Functions with enumerated default arguments cause bad python code to be generated"
This reverts commit 30fbd682ee.
2016-02-18 10:59:36 -06:00
Alex Lin
a9e4dfabcc Revert "Functions with enumerated default arguments cause bad python code to be generated"
This reverts commit 612591ce96.
2016-02-18 10:59:26 -06:00
Alex Lin
612591ce96 Functions with enumerated default arguments cause bad python code to be generated
OMG, more data recording files.

refs #176
2016-02-18 10:48:14 -06:00
Alex Lin
30fbd682ee Functions with enumerated default arguments cause bad python code to be generated
Found a lot more data recording groups that have the same problem.

refs #176
2016-02-18 10:21:12 -06:00
Alex Lin
20dc7b1386 Functions with enumerated default arguments bad
Found a side effect of SWIG's "compactdefaultargs".  It highlighted an
error we had in creating the data_record group in our ball sim.  We did
not release the memory from python and it was causing a double free
at exit.

refs #176
2016-02-18 09:56:11 -06:00
Alex Lin
83572b20cb Print some timing statistics when the sim exits
Saved the timestamps on the default gettimeofday clock as close to
the beginning of the simulation, after initialization is finished and
at the end of shutdown.  Printed out the elapsed time as well as
the number of overruns counted by RealtimeSync.

refs #183
2016-02-17 16:27:37 -06:00
Alex Lin
b4f0906e03 Merge in the er7_utils integrators
Added .gitignore for created makefiles in er7_utils.

refs #180
2016-02-11 14:13:25 -06:00
Alex Lin
6eef449a1c Don't process header files installed by Homebrew
Added /usr/local/Cellar to ICG's list of system header locations.

refs #181
2016-02-11 09:33:53 -06:00
Alex Lin
8a535cc44f Merge in the er7_utils integrators
Wasn't supposed to add the CheckpointHelper.

refs #180
2016-02-10 11:21:54 -06:00
Alex Lin
4c3015851f Merge in the er7_utils integrators
Taking in the latest er7_utils directory and adding it into Trick in the
same location it was as an external repository.  Made one change to
the files_to_ICG.hh file in the repository to remove the CheckpointHelper
header files.  Those go in the Trick files_to_ICG.hh file.

refs #180
2016-02-10 09:32:53 -06:00
Alex Lin
2ca4b72cee Trick model files found in external libraries are not being included correctly
Found that the list of swig files we should expect from external libraries
was incorrectly cleared before it was being used.  This still allows the
sim to compile, but no information about the models in the library are
available in the input file.

refs #179
2016-02-09 11:13:09 -06:00
Alex Lin
2b30a92342 Trick parsing comments improperly
When I split the comment remover into 2 regular expressions I reversed
the order removing C style comments before c++.  This caused this error
where a /* in a C++ comment made Trick look for the end of the C style
comment and it may never find the end.

refs #178
2016-02-05 11:19:53 -06:00
Alex Lin
6461b50d7d Setting framelog sample size does not work.
Setting the frame log size only resized the time line graph, not the normal
frame log groups.  Added code to change the size of the normal frame log
groups in addition to the time line.

refs #177
2016-02-04 16:13:05 -06:00
Alex Lin
030f44132c Merge branch 'master' of https://github.com/nasa/trick 2016-02-04 16:09:51 -06:00
Alex Lin
c9d5be4b95 Functions with enumerated default arguments bad
After digging around the SWIG issues database I found a feature
compactdefaultargs that creates a call to functions with default
arguments like it did before.  The important part is that the
code runs.

refs #176
2016-02-04 15:54:12 -06:00
Alex Lin
8529bd8648 make_makefile_swig writing duplicate rules
Used a hash instead of an array to store the names of files that
we need to process.  This eliminates duplicates.

refs #175
2016-02-04 15:48:29 -06:00
Alex Lin
447585ad16 ICG processing files it is supposed to skip
We pull file names out of the clang infrastructure to match where
classes are defined.  We use the file name to pull comments and find
and process Trick header comments.  Up to now clang gave us the realpath
of files and when we looked up comments we already had the realpath and
everything worked.  In clang 3.6 in some places we are not getting the
realpath anymore which confuses ICG.  Added code to get the realpath of
any file name we use throughout the code.

refs #167
2016-02-04 15:43:14 -06:00
Alex Lin
b9c871328b Introduce Open Dynamics Engine examples
Added a 3 wheeled car example from the ODE demos.  I collapsed all of the separate classes
handling the world, objects, and drawings into a single class.  Each world is different
and just including that with the objects for these simple examples is easier.  Same goes
for the drawing.

refs #172
2016-02-02 11:19:25 -06:00
Alex Lin
362366b908 er7_utils rkn4 directory is not compiled
Yup, it's not.  No one notices we've left it out for a couple of
years now.  I've added the directory to the list of directories to compile.

refs #173
2016-01-29 10:13:56 -06:00
Alex Lin
fa29891ded Introduce Open Dynamics Engine examples
Changed the regular expressions that removes comments in convert_swig to
try and handle C style comments found in multiline #define statements.

Also added a TRICK_ICG_NOCOMMENT line to SIM_ode to stop ICG from
trying to process non-Trick comments in the ODE directory.

refs #172
2016-01-29 09:43:43 -06:00
Alex Lin
71dab9ed45 Introduce Open Dynamics Engine examples
I want Trick to parse and understand ODE header files.  The ODE header files
include some typedef constructs ICG was skipping.  Added code to handle the
typedefs we did not handle before.  Also made a small change the way
TRICK_ICG_EXCLDUE and TRICK_EXCLUDE are used so that they support excluding
individual files as well as directories.
2016-01-29 09:27:41 -06:00
Alex Lin
68ffd04dff Introduce Open Dynamics Engine examples
Took the ODE bouncing ball tutorial sim and interfaced it within Trick.  Created classes to handle
interfacing with ODE and the DrawStuff graphics that comes with ODE.  Created classes
to contain the ball and the drawstuff graphics for the ball.

refs #172
2016-01-29 09:15:00 -06:00
Alex Lin
692d962b90 Sending the variable server a variable name that lists a composite type causes core dump
Duplicating change from 15.1.1.
If a variable resolves to a class/structure type the variable server tries to free the
attributes associated with that variable name.  But the attributes usually point to
a fixed place in memory that is not allocated.  I removed the free statement.  I don't
believe this will lead to a memory leak.

refs #165
2016-01-26 16:02:15 -06:00
Alex Lin
bc9ef8c54b Library dependencies with full path not found
When I merged the sections of code that look for library dependencies I left out
the section that searches for dependencies that have a full path.  I added
that back in.

refs #170
2016-01-26 15:25:26 -06:00
Alex Lin
63f193441c typedef of const structures not understood by SWIG
I kind of took the easy way out on this one, I remove any
structure definitions that matches the pattern
typedef const struct A {...} constA ; out of out of
convert_swig before they get to SWIG.

refs #169
2016-01-26 15:23:08 -06:00
Alex Lin
a8c8c49f0d Stripchart does not start with input file
Found that the stripchart calls itself when reading variables
from an input file.  The command to call itself was using the old
executable name trick_stripchart instead of the new trick-stripchart.

refs #166
2016-01-20 16:50:23 -06:00
Alex Lin
7e542440d1 Add a time variable in seconds to the variable server
Added a time variable that is in seconds.  A created a special case
for var_add if you add "time" then this variable will be added to
the list of variables returned.

trick.var_add("time")

refs #151
2016-01-14 10:49:27 -06:00
Alex Lin
903ff05960 data record buffering optimizations
Added a loop to set each 1024th byte in the recording array to 1 once the
memory has been allocated.  Need to test if this is good enough to get Linux
to allocate the memory.

Added a current recording buffer pointer to use instead of using array offsets.
This should be more cpu cache efficient.

Changed the memcpy calls to direct casted integer assignments based on the size of the
parameter.  If the parameter is not size 1,2,4,or 8 we fall back to a memcpy.

refs #155
2016-01-14 08:31:13 -06:00
Alex Lin
a08b313457 configure script does not check for clang/llvm
Use the clang executable we find in the configure script for building ICG.

refs #130
2016-01-13 09:22:46 -06:00
Alex Lin
ce1962b55d make doxygen broken
Updated the directory names in the doxygen files to match the new directory locations
of our source code files.  The documentation builds now.  But we still need to
remove the duplicate documentation that is now in the wiki, because the wiki is
more up to date.

refs #158
2016-01-13 09:18:09 -06:00