Commit Graph

893 Commits

Author SHA1 Message Date
Thadeus Fleming
db07582616 Only left-shift FieldDescription::io when io_found == true
The `io` field of `FieldDescription` takes a default value of 15. In
`FieldDescription::parseComment`, it may be updated as specified in the comment
text. There are 4 possible cases:

1) Neither IO attributes nor checkpoint IO attributes are found in the comment
2) IO attributes are found in the comment, but checkpoint IO attributes are not
3) Checkpoint IO attributes are found in the comment, but IO attributes are not
4) Both IO attributes and checkpoint IO attributes are found in the comment

In case 2, the IO attributes are copied into the checkpoint IO attributes by the
statement `io |= (io << 2)`. However, this also erroneously runs in case 1,
causing the default value of 15 to change to 63.

By testing `io_found == true`, this logic occurs only in case 2.

Fixes #568
2018-03-27 09:37:26 -05:00
Scott Fennell
f68950db9f
Merge pull request #581 from nasa/java-unit-test
Java GUI unit tests reintegrated with Trick
2018-03-21 09:04:04 -05:00
Scott Fennell
a1aaf52ce7 #521 preparation for java 10 support for xmls annotation and improved safety of file separator call 2018-03-21 08:27:11 -05:00
Derek Bankieris
c1aff35a6a Don't suppress errno
Refs #583
2018-03-20 15:21:13 -05:00
Derek Bankieris
69d64fb582 Infer TRICK_HOME automatically
Refs #358
2018-03-20 15:09:30 -05:00
John M. Penn
c7d95da9a8 Implement function to generate a transformation matrix to rotate a vector to new a new orientation. Ref #582 2018-03-19 18:10:04 -05:00
Scott Fennell
4030757304 formatting 2018-03-15 15:32:44 -05:00
Scott Fennell
206a928a98 #521 removed build.xml 2018-03-15 15:22:19 -05:00
Scott Fennell
f6fa9cdf3e #506 added additional check on run directory to prevent creation as defaul… (#566)
* added additional check on run directory to prevent creation as default output directory

* #506 edited error messages to include strerror
2018-03-14 15:18:37 -05:00
Scott Fennell
84f15d8361 #521 more makefile editing for java unit tests 2018-03-14 15:01:02 -05:00
Scott Fennell
eee6b12a6b #521 edit resource locations in test source 2018-03-14 13:33:13 -05:00
Scott Fennell
8ee0614309 create directory in makefile 2018-03-14 10:55:09 -05:00
Scott Fennell
86eb23c7de #521 added unit tests to build and 3rd party XML formatter that does not rely on ant 2018-03-14 10:29:44 -05:00
Derek Bankieris
050e552d7c Update ICG for clang 6
Fixes #578
2018-03-13 09:30:01 -05:00
Derek Bankieris
37b1e02455 Replace perror with strerror
Instead of printing the numeric value of errno, how about we do
something helpful?
2018-03-08 14:50:13 -06:00
Derek Bankieris
1179007fa1 Infer TRICK_HOME automatically
Refs #358
2018-03-08 14:44:36 -06:00
Derek Bankieris
2ce53dadd2 Move pymods into share/trick
Fixes #574
2018-03-05 15:17:22 -06:00
Derek Bankieris
6d6d3189e3 Add units_conv.h to files_to_ICG.hh
Fixes #575
2018-03-05 15:03:27 -06:00
Alex Lin
573a6bf2a5 Java 9 Compatibility #572
Made changes to the command to get the java version to make it
compatible with the mac.  Also snuck in my perl script to parse
out the version.
 ____           _ _  _   _____
|  _ \ ___ _ __| | || | | ____|_   _____ _ __
| |_) / _ \ '__| | || |_|  _| \ \ / / _ \ '__|
|  __/  __/ |  | |__   _| |___ \ V /  __/ |
|_|   \___|_|  |_|  |_| |_____| \_/ \___|_|
2018-03-02 09:19:11 -06:00
Scott Fennell
3de9a3b2be formatting 2018-03-02 09:19:11 -06:00
Scott Fennell
2fe85f615a #490 #494 edited java/makefile to include java.se.ee when compiling with java 9 2018-03-02 09:19:11 -06:00
Scott Fennell
13c90afaee removed unneeded module 2018-03-02 09:19:11 -06:00
Scott Fennell
a2cf18f6d3 Added needed module compiler flags and changed MtvView Vector<Object> to Vector<Vector> for Java 9 DefaultTableModel constructor compatibility 2018-03-02 09:19:11 -06:00
Alex Lin
4bf35a9c82 Revert "Merge pull request #533 from nasa/MakefileCleanup"
This reverts commit 269ed77cb4, reversing
changes made to d97f482219.
2018-03-02 08:59:26 -06:00
John M. Penn
c9a121aa27 Fix format codes in CSV_Formatter. Ref #570 2018-03-01 12:10:30 -06:00
Alex Lin
269ed77cb4
Merge pull request #533 from nasa/MakefileCleanup
Trick makefile output formatting and cleanup.
2018-03-01 08:54:13 -06:00
Alex Lin
9dd302f4b1 Trick makefile output formatting and cleanup. #533
Removed the red from the clean rules.  We'd like to reserve red for
errors.  Ended up removing all color from the clean side.
2018-03-01 08:51:57 -06:00
Alex Lin
9643311f4c Merge branch 'master' into MakefileCleanup 2018-03-01 08:32:08 -06:00
Alex Lin
d97f482219 Allow the FrameLog class to use a different clock #571
Added a clock reference that to the FrameLog class that defaults
to the GetTimeOfDay clock.  This clock has fast access and is
non intrusive to real-time operations using a different clock.

Added a function to set the clock to something else if desired.
2018-02-28 17:33:09 -06:00
John M. Penn
aee322927d Merge branch 'master' of https://github.com/nasa/trick 2018-02-28 15:35:07 -06:00
John M. Penn
d17d48d040 Fixed trkConvert to recognize TRICK_BOOLEAN and LogFormatter interface. Ref #570 2018-02-28 15:34:46 -06:00
Derek Bankieris
27bf0b030b Dequeue timed-out runs if the slave later returns
Fixes #569
2018-02-28 14:13:05 -06:00
John M. Penn
4f0093ddd6 Created a function function to calculate transform using Rodrigues formula. Ref #567 2018-02-27 18:24:40 -06:00
Derek Bankieris
8bdcd28631 Don't use TRICK_HOST_CPU in MonteCarlo SHH command
Fixes #564
2018-02-27 09:38:12 -06:00
John M. Penn
64d44d6fa8 Updates to Trick 17 Tutorial slides. Ref #554 2018-02-22 15:47:40 -06:00
John M. Penn
907cd2c481 Created Trick17 Tutorial Review Slides. Ref #554 2018-02-20 18:25:26 -06:00
Alex Lin
0936cee67e Separate verbosity levels for Monte Carlo dispatches and parametrizations #548
Changed verbosity check from INFORMATIONAL to ALL as requested.
2018-02-20 09:56:14 -06:00
Alex Lin
2b241acc0f Put units warnings in MAKE_out #547
Redirected the output of ICG and other commands in the top level
makefile to build/MAKE_out.  Moved the command that removes the
MAKE_out file to where it will only be executed once when the
make process starts.
2018-02-20 09:47:59 -06:00
Alex Lin
15bfd75b32 Don't resize active event array size with every operation #562
Started the active event allocation at 100 events.  If more are needed, we
add 100 allocations each time.  The array is never reduced in size if
events are deleted, events are moved to the front of the array and the
remaining elements are set to NULL.
2018-02-14 17:28:21 -06:00
Alex Lin
8be09638e7 make_makefile_swig sometimes goes into infinite loop #561
Found a similar loop in make_makefile_src that can go into an infinite loop.
2018-02-09 10:14:49 -06:00
Alex Lin
7a3fc1353e Some of Trick's unit conversions have too many significant digits #557
Fixing force conversions in unit test for too many digits.
2018-02-09 10:07:53 -06:00
Alex Lin
3ac538775b make_makefile_swig sometimes goes into infinite loop #561
Added a check to see if array has elements before we shift an empty array.
2018-02-09 09:38:58 -06:00
Alex Lin
049c9a3207 Some of Trick's unit conversions have too many significant digits #557
Hard coded values in unit conversion test program.
2018-02-09 08:52:42 -06:00
Alex Lin
bc8d1a3796 The total overruns printout at sim exit prints the wrong parameter. #560
Changed the printout to print the total number of overruns.
2018-02-08 16:18:11 -06:00
Derek Bankieris
4b2f6e660f Support use of MAKEFILE_LIST in makefile_overrides
Refs #544
2018-02-07 09:11:24 -06:00
Alex Lin
f4b4d00ac8
Merge pull request #558 from pappyvw/ci-interface-unittest
Creating additional C-interface routines for UnitTest. #511
2018-02-05 17:26:01 -06:00
John M. Penn
e8525ac796 Improved Explosion sound effect. Ref #550 2018-02-05 11:06:14 -06:00
Pappy Van Winkle
d7e8d48a8a Creating additional C-interface routines for UnitTest. #511 2018-02-03 19:56:08 -06:00
Alex Lin
27d18f07f3 Some of Trick's unit conversions have too many significant digits #557
Our constants.h file has the same problem, some units have too many
significant digits.  Truncated some of the values.
2018-02-02 15:10:56 -06:00
Alex Lin
940a275192 Some of Trick's unit conversions have too many significant digits #557
Changed the conversion factors for lb, slug, and oz (force) to match
the accepted values.
2018-02-02 14:10:39 -06:00