John M. Penn
3511800234
Merge branch 'experiment'
...
Organize and update the Cannon Sims for Trick Tutorial Changes Ref#338
2016-10-27 15:04:49 -05:00
John M. Penn
0c5a4a07c2
Add RUN_graphics scenario to SIM_cannon_numeric
2016-10-27 14:37:14 -05:00
John M. Penn
11f52b9274
Update impact time calculation in canon analytic
2016-10-27 13:19:27 -05:00
Derek Bankieris
cde7c02d22
Use 1/0 instead of True/False in TVBoolean.java
...
The use of True/False prevents the plotting of booleans, as those values
cannot be parsed as doubles. While it's conceptually more pleasing to
use the actual Python keywords for booleans, numbers will work just as
well and allow plotting. #337
2016-10-26 13:38:58 -05:00
Derek Bankieris
90eb381987
Fix indentation
2016-10-26 13:35:20 -05:00
Derek Bankieris
0a664abdeb
Prepend trick app launch commands with trick- #336
2016-10-26 12:12:49 -05:00
Derek Bankieris
c1af5ba0e2
Correct class declaration regex
...
The pattern looking for inheritance should be optional #332
2016-10-26 08:51:04 -05:00
Derek Bankieris
b9ede7432a
Correct class declaration regex #332
2016-10-25 15:36:45 -05:00
Derek Bankieris
055a7337e4
Match entire class declaration at once
...
The previous commit fixed the original issue, but matched templated
classes incorrectly. This should handle all cases. #332
2016-10-25 12:51:51 -05:00
Derek Bankieris
73816bbd9a
Corrected regex to match classes that don't inherit #332
2016-10-25 12:36:18 -05:00
Derek Bankieris
0ba68e40aa
Merge branch 'master' of https://github.com/nasa/trick
...
Conflicts:
trick_source/codegen/Interface_Code_Gen/main.cpp
2016-10-21 15:15:41 -05:00
Derek Bankieris
015965abab
Renamed most variabes so that they are self-descriptive. Stop using abbreviations! No one can tell what anything is.
...
Applied a consistent formatting.
Inlined several one-off variables.
2016-10-21 15:06:44 -05:00
Derek Bankieris
108d3d40c5
Added a version of almostRealPath that takes a const std::string& parameter so we don't have to use c_str() everywhere
2016-10-21 15:06:35 -05:00
Derek Bankieris
75c35752d6
Spacing
2016-10-21 15:05:26 -05:00
Alex Lin
a2452aacd0
ICG creates offsetof statements that will not compile when using clang #327
...
When copying inherited variables to a child class in ICG, the inherited flags
were not being set on the mac.
2016-10-21 13:13:43 -05:00
Alex Lin
f1cbacd646
ICG exclude of class member variables now defines incorrect memory offsets in io_src #311
...
This changes back the default behavior to not use offsetof in io_src code.
Added a flag to ICG, -c or --compat15, to globally generate offsetof statements.
Added an ENV variable that can be used to generate offsetof statements by file or directory.
Added in a warning if classes parsed at ICG time are different in size than at runtime.
2016-10-21 13:13:43 -05:00
Derek Bankieris
5484e39f11
Fix spacing in warning message
2016-10-21 10:50:11 -05:00
Derek Bankieris
bcb421678a
Fix spacing. Move declaration of loop variable into loop initializer. Rename stupid 1337 variable.
2016-10-21 10:49:11 -05:00
Derek Bankieris
f5e223cee9
Standardize output format #326
2016-10-21 10:06:23 -05:00
Derek Bankieris
2279ba8648
Restore print out when compiling io_* files #326
2016-10-21 09:20:50 -05:00
John M. Penn
37a75bc34e
Update SIM_cannon_numeric
2016-10-20 19:12:31 -05:00
John M. Penn
8b89bac5ad
Update cannon headers
2016-10-20 19:10:58 -05:00
John M. Penn
c1a60f3c8f
Moved README.md and images from SIM_cannon_integ to SIM_cannon_numeric
2016-10-20 19:08:41 -05:00
John M. Penn
8e7285f116
Add modelTime integration to SIM_cannon_numeric
2016-10-20 17:39:32 -05:00
John M. Penn
4f9c1cdc0b
Get rid of SIM_cannon_dt and combine Sim_cannon_contact and SIM_cannon_integ
2016-10-20 17:35:27 -05:00
Derek Bankieris
4f49460a6f
Clean up io_* code #330
2016-10-20 14:55:00 -05:00
Derek Bankieris
0039b95a73
Removed compiler option to silence set but unused variable warnings, which was obviated by the prior commit #326
2016-10-20 14:55:00 -05:00
Derek Bankieris
beb93f7e88
Removed useless local alias, eliminating the need to silence set but unused variable warnings #326
2016-10-20 14:55:00 -05:00
John M. Penn
8f585baae2
Worked out a design for the Cannonball Variable server client that I'm happy with. Ref#320
2016-10-19 18:20:32 -05:00
John M. Penn
7d34272dce
Merge branch 'master' of https://github.com/nasa/trick
2016-10-19 17:40:06 -05:00
John M. Penn
9b1ef5404a
Update SIM_cannon_analytic and add ability to launch new graphics client. Ref #320
2016-10-19 17:39:47 -05:00
Derek Bankieris
dae2b0e1c3
Corrected SWIG ignore warning number #326
2016-10-19 14:48:28 -05:00
Derek Bankieris
9f4c854353
Pass SWIG_FLAGS when calling SWIG in trickify.mk #326
2016-10-19 14:43:32 -05:00
Derek Bankieris
4db4427f5d
Ignore SWIG nested class warnings #326
2016-10-19 14:42:50 -05:00
Derek Bankieris
2fb06cf133
Got rid of the individual io, py, and model conglomerate objects #326
...
Link all of the objects as part of the S_MAIN target using the link lists.
Renamed some variables and files to make them more self-descriptive.
2016-10-18 13:06:42 -05:00
Derek Bankieris
bc131147c3
Pass TRICK_ICGFLAGS to invocation of ICG #309
2016-10-13 15:16:40 -05:00
Derek Bankieris
51c544a5d7
Replaced the per directory, per extension bookkeeping with pattern rules and a single list of model object files ( #326 ).
...
Also, I went ahead and removed lex and yacc support since it didn't fit with the new approach and hasn't worked for over a year (#102 ).
2016-10-13 13:30:41 -05:00
Derek Bankieris
f3fc813234
Narrowed the scope of a static pattern rule
2016-10-12 13:57:43 -05:00
Derek Bankieris
4eafabe1f1
Fix support for source file extension .c++ #326
2016-10-12 13:55:51 -05:00
Alex Lin
23af89681e
ICG creates offsetof statements that will not compile when using clang #327
...
Added a check that was in 15 that tested the platform we are running on. If we
are on an mac, we want to skip fully qualifying variable names because it creates
code that doesn't compile under clang.
2016-10-12 13:34:04 -05:00
Alex Lin
60348f8335
remove CHANGELOG.md #322
...
removed!
2016-10-12 13:34:03 -05:00
Derek Bankieris
86ee472a84
More build output format normalization #326
2016-10-12 10:52:31 -05:00
Derek Bankieris
c4456e3913
Generate S_define.deps when S_source.hh is created #326
2016-10-12 10:09:20 -05:00
Derek Bankieris
efb20e7d5f
Prepend the execution of S_MAIN with ./ #326
2016-10-11 13:25:07 -05:00
Derek Bankieris
f31da79139
Got rid of the apocalypse target. Make will no longer tolerate frivolity #326
2016-10-11 11:47:37 -05:00
Derek Bankieris
b5b46d9c75
Use immediate instead of deferred assignment when copying TRICK_SYSTEM_CXXFLAGS to TRICK_SYSTEM_CFLAGS
2016-10-06 16:00:22 -05:00
Derek Bankieris
abc7072918
Return the rediculous "feature" of automagically including -I$(PWD)/../include in the compiler flags
2016-10-06 15:37:43 -05:00
Derek Bankieris
47c8c2efb9
Removed dead code
2016-10-06 15:04:16 -05:00
John M. Penn
7544f4f96a
Stop DPX makefile from trying to make catalog.xml. Ref #324
2016-10-06 14:53:36 -05:00
Derek Bankieris
054245f968
Forgot to remove this debugging print out before the last commit
2016-10-06 14:28:06 -05:00