ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-08 11:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Trick-ify

Browse Source
This commit is contained in:
Pherring04 2025-02-03 11:51:07 -06:00
commit 9578258cd4
34 changed files with 894 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/alt_linux_distros.yml vendored
View File

@ -141,7 +141,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`

2
.github/workflows/code_coverage.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
dnf install -y gtest-devel gmock-devel
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Configure Trick
run: |

2
.github/workflows/python_tests_linux.yml vendored
View File

@ -140,7 +140,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Info after checkout
run: |
pwd

2
.github/workflows/python_tests_macos.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Install python
run: |
brew install python

2
.github/workflows/test_32_oracle.yml vendored
View File

@ -56,7 +56,7 @@ jobs:
make
make install
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Trick
run: |
export CFLAGS="-m32"

4
.github/workflows/test_linux.yml vendored
View File

@ -129,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
@ -146,7 +146,7 @@ jobs:
python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}

4
.github/workflows/test_linux_py2.yml vendored
View File

@ -129,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
@ -145,7 +145,7 @@ jobs:
python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}

4
.github/workflows/test_macos.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
runs-on: macos-13
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install gtest
run: |
brew install googletest
@ -42,7 +42,7 @@ jobs:
export MAKEFLAGS=-j4
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_macos

10
.github/workflows/trickops.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
- name: create virtual environment
run: |
cd share/trick/trickops/
python3 -m venv .venv && source .venv/bin/activate && pip3 install -r requirements.txt
python3 -m venv .venv && source .venv/bin/activate && pip3 install --upgrade pip && pip3 install -r requirements.txt
- name: get and build koviz
run: |
cd /tmp/ && wget -q https://github.com/nasa/koviz/archive/refs/heads/master.zip && unzip master.zip
@ -31,10 +31,10 @@ jobs:
source ../.venv/bin/activate
export PATH="/tmp/koviz-master/bin:${PATH}"
./run_tests.py
- uses: actions/upload-artifact@v3.0.0
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: doctests
name: doctests_${{ github.run_id }}_${{ github.job }}
path: |
share/trick/trickops/tests/*_doctest_log.txt
/tmp/log.*
@ -63,10 +63,10 @@ jobs:
source ../.venv/bin/activate
export PATH="/tmp/koviz-master/bin:${PATH}"
./run_tests.py
- uses: actions/upload-artifact@v3.0.0
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: doctests
name: doctests_${{ github.run_id }}_${{ github.job }}
path: |
share/trick/trickops/tests/*_doctest_log.txt
/tmp/log.*

6
README.md
View File

@ -8,13 +8,13 @@
<p align=center>
<a href="https://github.com/nasa/trick/actions?query=workflow%3ALinux">
<img src="https://github.com/nasa/trick/workflows/Linux/badge.svg?branch=master" alt="Linux" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_linux.yml/badge.svg?branch=master" alt="Linux" height=30px>
</a>
<a href="https://github.com/nasa/trick/actions?query=workflow%3AmacOS">
<img src="https://github.com/nasa/trick/workflows/macOS/badge.svg?branch=master" alt="macOS" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_macos.yml/badge.svg?branch=master" alt="macOS" height=30px>
</a>
<a href="https://github.com/nasa/trick/actions?query=workflow%3A32-bit">
<img src="https://github.com/nasa/trick/workflows/32-bit/badge.svg?branch=master" alt="32-bit" height=30px>
<img src="https://github.com/nasa/trick/actions/workflows/test_32_oracle.yml/badge.svg?branch=master" alt="32-bit" height=30px>
</a>
</p>

51
docs/documentation/miscellaneous_trick_tools/TrickOps.md
View File

@ -423,6 +423,57 @@ if ret == 0: # Successful generation
Note that the number of runs to-be-generated is configured somewhere in the `input.py` code and this module cannot robustly know that information for any particular use-case. This is why `monte_dir` is a required input to several functions - this directory is processed by the module to understand how many runs were generated.
## `send_hs` - TrickOps Helper Class for Parsing Simulation Diagnostics
Each Trick simulation run directory contains a number of Trick-generated metadata files, one of which is the `send_hs` file which represents all output during the simulation run sent through the Trick "(h)ealth and (s)tatus" messaging system. At the end of the `send_hs` message, internal diagnostic information is printed by Trick that looks a lot like this:
```
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
REALTIME SHUTDOWN STATS:
ACTUAL INIT TIME: 42.606
ACTUAL ELAPSED TIME: 55.551
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
SIMULATION TERMINATED IN
PROCESS: 0
ROUTINE: Executive_loop_single_thread.cpp:98
DIAGNOSTIC: Reached termination time
SIMULATION START TIME: 0.000
SIMULATION STOP TIME: 68.955
SIMULATION ELAPSED TIME: 68.955
USER CPU TIME USED: 55.690
SYSTEM CPU TIME USED: 0.935
SIMULATION / CPU TIME: 1.218
INITIALIZATION USER CPU TIME: 42.783
INITIALIZATION SYSTEM CPU TIME: 0.901
SIMULATION RAM USAGE: 1198.867MB
(External program RAM usage not included!)
VOLUNTARY CONTEXT SWITCHES (INIT): 792
INVOLUNTARY CONTEXT SWITCHES (INIT): 187
VOLUNTARY CONTEXT SWITCHES (RUN): 97
INVOLUNTARY CONTEXT SWITCHES (RUN): 14
```
The information provided here is a summary of how long the simulation ran, in both wall-clock time, and cpu time, both for initialization and run-time, and other useful metrics like how much peak RAM was used during run-time execution. Tracking this information can be useful for Trick-using groups so TrickOps provides a utility class for parsing this data. Here's an example of how you might use the `send_hs` module:
```python
import send_hs # Import the module
# Instantiate a send_hs instance, reading the given send_hs file
shs = send_hs.send_hs("path/to/SIM_A/RUN_01/send_hs")
start_time = shs.get('SIMULATION START TIME') # Get the value of sim start time
stop_time = shs.get('SIMULATION STOP TIME') # Get the value of sim stop time
realtime_ratio = shs.get('SIMULATION / CPU TIME') # Get the realtime ratio (how fast the sim ran)
# Instead of getting diagnostics individually, you can ask for the full dictionary
diagnostics = shs.get_diagnostics()
# Print the RAM usage from the dictionary
print(diagnostics['SIMULATION RAM USAGE'])
```
Plotting this data for regression scenarios can be quite useful - a lot of groups would want to know if the sim slowed down significantly and if so, when in the history this occurred. If you are already invested in Jenkins CI, you might be interested in using the `send_hs` module in conjunction with the [Jenkins plot plugin](https://plugins.jenkins.io/plot/). Here's an example of what tracking sim realtime ratio over time looks like in a workflow with about 15 regression scenarios all shown on a single plot:
![ExampleWorkflow In Action](images/sim_speed_example.png)
## More Information
A lot of time was spent adding `python` docstrings to the modules in the `trickops/` directory and tests under the `trickops/tests/`. This README does not cover all functionality, so please see the in-code documentation and unit tests for more detailed information on the framework capabilities.

BIN
docs/documentation/miscellaneous_trick_tools/images/sim_speed_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

1
share/trick/trickops/MonteCarloGenerationHelper.py
View File

@ -30,7 +30,6 @@ if ret == 0: # Successful generation
import sys, os
import send_hs
import argparse, glob
import subprocess, errno

295
share/trick/trickops/send_hs.py
View File

@ -1,67 +1,254 @@
import re, os
import pdb
# This global is the result of hours of frustration and debugging. This is only used by doctest
# but appears to be the only solution to the problem of __file__ not being an absolute path in
# some cases for some python versions and how that interacts with this class's os.chdir() when its
# base class initializes. If you attempt to define this_trick locally in the doctest block,
# which was my original attempt, you will find that the value of this_trick is different inside
# the __init__ doctest evaluation compared to any other member function. I believe this is only
# the case when using python version < 3.9, according to the information found here:
# https://note.nkmk.me/en/python-script-file-path/
# I do not like adding globals to "production code" just to facilitate a testing mechanism, but
# I don't know of any cleaner way way to do this. -Jordan 12/2024
this_trick = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../..'))
class send_hs(object):
"""
Reads a file containing the send_hs output and returns a send_hs
object containing the values from that output
Utility class for parsing simulation diagnostic data at the end of a
Trick-generated send_hs output file.
"""
def __init__(self, hs_file):
self.hs_file = hs_file
self.actual_init_time = None
self.actual_elapsed_time = None
self.start_time = None
self.stop_time = None
self.elapsed_time = None
self.actual_cpu_time_used = None
self.sim_cpu_time = None
self.init_cpu_time = None
self.parse()
def parse(self):
f = open(self.hs_file, 'r')
lines = f.readlines()
for line in lines:
self.actual_init_time = self.attempt_hs_match('ACTUAL INIT TIME',self.actual_init_time, line)
self.actual_elapsed_time = self.attempt_hs_match('ACTUAL ELAPSED TIME',self.actual_elapsed_time, line)
self.start_time = self.attempt_hs_match('SIMULATION START TIME',self.start_time, line)
self.stop_time = self.attempt_hs_match('SIMULATION STOP TIME',self.stop_time, line)
self.elapsed_time = self.attempt_hs_match('SIMULATION ELAPSED TIME',self.elapsed_time, line)
self.actual_cpu_time_used = self.attempt_hs_match('ACTUAL CPU TIME USED',self.actual_cpu_time_used, line)
self.sim_cpu_time = self.attempt_hs_match('SIMULATION / CPU TIME',self.sim_cpu_time, line)
self.init_cpu_time = self.attempt_hs_match('INITIALIZATION CPU TIME',self.init_cpu_time, line)
# TODO add capture of blade and DIAGNOSTIC: Reached termination time as success criteria
def __init__(self, hs_file=None):
"""
Initialize this instance.
def attempt_hs_match(self, name, var, text):
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
Parameters
----------
hs_file : str
Path to the send_hs output to read and parse
"""
name: pattern to match (e.g. SIMULATION START TIME)
var: variable to assign value if match found
text: text to search for pattern
returns: var if not found, found value if found
self.hs_file = hs_file
self.num_lines = None
self._diagnostics = {} # Internal dict of diagnostic keys and values
self._missing_diagnostics = [] # List of diagnostics we failed to find
for k in self.keys():
self._diagnostics[k] = None
if hs_file:
self.parse()
def is_valid(self):
"""
Check for validity of the parsed send_hs file. If any expected internal members
were not able to be parsed, store them in missing_diagnostics and return False.
If everything was found, return True
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.is_valid()
True
Returns
-------
True if all expected internal members were parsed. False if any member wasn't found.
"""
self._missing_diagnostics = [] # Reset the internal list
for d in self._diagnostics:
if self._diagnostics[d] is None:
self._missing_diagnostics.append(d)
if self._missing_diagnostics:
return False
else:
return True
def missing_diagnostics(self):
'''
Check for validity and return a list of any missing diagnostics that we were
unable to find in the send_hs output
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.missing_diagnostics()
[]
Returns
-------
list
All diagnotics that were unable to be parsed
'''
self.is_valid()
return self._missing_diagnostics
def parse(self, hs_file=None):
'''
Parse the content of self.hs_file and assign internal variables for each field found
if hs_file is given, overwrite self.hs_file with it's value
>>> sh = send_hs()
>>> sh.parse(os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh2 = send_hs()
>>> sh2.parse()
Traceback (most recent call last):
...
RuntimeError: send_hs file: 'None' cannot be read. You must provide a valid send_hs output file.
Parameters
----------
hs_file : str
Path to hs_file to parse. If None, self.hs_file is used instead.
Raises
------
RuntimeError
If no send_hs file was provided at construction or when calling this function
'''
if hs_file:
self.hs_file = hs_file
if not self.hs_file or not os.path.isfile(self.hs_file):
raise RuntimeError(f"send_hs file: '{self.hs_file}' cannot be read."
" You must provide a valid send_hs output file.")
self.num_lines = 0
with open(self.hs_file) as fp:
# Efficiency guard - we don't do an re pattern match until we've starting parsing the diagnostic msg
start_reading_diagnostics = False
for line in fp:
self.num_lines += 1
# NOTE this "attempt match" approach is less efficient but it should be
# robust to a future ordering change of the lines from Trick's output.
if start_reading_diagnostics:
for d in self._diagnostics:
if self._diagnostics[d] is None:
self._diagnostics[d] = self._attempt_hs_match(d, line)
# This text precedes the diagnostics output, use it as the trigger to start parsing
if 'REALTIME SHUTDOWN STATS:' in line:
start_reading_diagnostics = True
continue
# Set validity status immediately after parsing
self.is_valid()
def _attempt_hs_match(self, name, text):
"""
Parameters
----------
hs_file : str
Path to hs_file to parse. If None, self.hs_file is used instead.
name : str
Pattern to match (e.g. SIMULATION START TIME)
text : str
Text to search for pattern within
Returns
----------
float or None
Value of name if found, else: None
"""
name = name.replace('(', '\(').replace(')', '\)')
m = re.match(name+': +([-]?[0-9]*\.?[0-9]+)', text.strip())
if m:
return(float(m.group(1)))
return(var)
else:
return(None)
def get(self,name):
"""
Get a value by the name that appears in the send_hs message
"""
if 'ACTUAL INIT TIME' in name:
return self.actual_init_time
if 'ACTUAL ELAPSED TIME' in name:
return self.actual_elapsed_time
if 'SIMULATION START TIME' in name:
return self.start_time
if 'SIMULATION STOP TIME' in name:
return self.stop_time
if 'SIMULATION ELAPSED TIME' in name:
return self.elapsed_time
if 'ACTUAL CPU TIME USED' in name:
return self.actual_cpu_time_used
if 'SIMULATION / CPU TIME' in name:
return self.sim_cpu_time
if 'INITIALIZATION CPU TIME' in name:
return self.init_cpu_time
else:
return None
def keys(self) -> list:
"""
Return a list of all possible keys/names that get() can accept This is
the master list of all diagnostics we search for when we parse the send_hs
file, and naming should match 1:1 with the output of a Trick simulation
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.keys() #doctest: +ELLIPSIS
['ACTUAL INIT TIME', ... 'INVOLUNTARY CONTEXT SWITCHES (RUN)']
Returns
-------
list
All possible diagnostic names that get() can accept
"""
return (['ACTUAL INIT TIME',
'ACTUAL ELAPSED TIME',
'SIMULATION START TIME',
'SIMULATION STOP TIME',
'SIMULATION ELAPSED TIME',
'USER CPU TIME USED',
'SYSTEM CPU TIME USED',
'SIMULATION / CPU TIME',
'INITIALIZATION USER CPU TIME',
'INITIALIZATION SYSTEM CPU TIME',
'SIMULATION RAM USAGE',
'VOLUNTARY CONTEXT SWITCHES (INIT)',
'INVOLUNTARY CONTEXT SWITCHES (INIT)',
'VOLUNTARY CONTEXT SWITCHES (RUN)',
'INVOLUNTARY CONTEXT SWITCHES (RUN)'
])
def get_diagnostic (self, name: str) -> float:
"""
Get a diagnostic value by it's name or partial name
The first name matched in the self._diagnostics dict will be returned
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.get_diagnostic('ACTUAL INIT TIME')
42.606
>>> sh.get_diagnostic('SIMULATION RAM USAGE')
1198.867
Parameters
----------
name : str
Name or partial name of diagnostic to retrieve
Returns
-------
float
Value of diagnostic name given
Raises
------
LookupError
If name cannot be found in self._diagnostics
"""
for d in self._diagnostics:
if name in d:
return(self._diagnostics[d])
raise LookupError(f"Unable to get diagnostic '{name}'. Is it spelled correctly?")
def get(self, name: str) -> float:
"""
Get a diagnostic value by it's name or partial name. Convienence function that
calls self.get() directly.
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.get('ACTUAL INIT TIME')
42.606
>>> sh.get('SIMULATION RAM USAGE')
1198.867
Returns
-------
float
Value of diagnostic name given
"""
return self.get_diagnostic(name)
@property
def diagnostics (self) -> dict:
return dict(self._diagnostics)
def get_diagnostics (self) -> dict:
"""
Get all diagnostics stored in internal self._diagnostics dictionary
>>> sh = send_hs(hs_file=os.path.join(this_trick,"share/trick/trickops/tests/send_hs.nominal"))
>>> sh.get_diagnostics() #doctest: +ELLIPSIS
{'ACTUAL INIT TIME': 42.606, 'ACTUAL ELAPSED TIME': 55.551, ... 14.0}
Returns
-------
dict
A copy of the internal self._diagnostics dictionary
"""
return (self.diagnostics)

2
share/trick/trickops/tests/run_tests.py
View File

@ -34,7 +34,7 @@ def run_tests(args):
# Run all doc tests by eating our own dogfood
doctest_files = ['TrickWorkflow.py', 'WorkflowCommon.py', 'TrickWorkflowYamlVerifier.py',
'MonteCarloGenerationHelper.py']
'MonteCarloGenerationHelper.py', 'send_hs.py']
wc = WorkflowCommon(this_dir, quiet=True)
jobs = []
log_prepend = '_doctest_log.txt'

5
share/trick/trickops/tests/send_hs.missing_all Normal file
View File

@ -0,0 +1,5 @@
|L 3|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Failed to resolve parameter 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable'
|L 2|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Mismatched data types for 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable' -> 'another_structure.myvariable'
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.flexMode.
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.myarray[0].
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable foo.bar.yippy.skippy.axial_sep_distance.

26
share/trick/trickops/tests/send_hs.missing_some Normal file
View File

@ -0,0 +1,26 @@
|L 3|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Failed to resolve parameter 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable'
|L 2|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Mismatched data types for 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable' -> 'another_structure.myvariable'
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.flexMode.
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.myarray[0].
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable foo.bar.yippy.skippy.axial_sep_distance.
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
REALTIME SHUTDOWN STATS:
ACTUAL INIT TIME: 32.306
ACTUAL ELAPSED TIME: 35.551
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
SIMULATION TERMINATED IN
PROCESS: 0
ROUTINE: Executive_loop_single_thread.cpp:98
DIAGNOSTIC: Reached termination time
SIMULATION START TIME: -10.000
SIMULATION STOP TIME: 78.955
SIMULATION ELAPSED TIME: 88.955
SYSTEM CPU TIME USED: 3.235
SIMULATION / CPU TIME: 9.218
INITIALIZATION USER CPU TIME: 72.763
SIMULATION RAM USAGE: 193.867MB
(External program RAM usage not included!)
VOLUNTARY CONTEXT SWITCHES (INIT): 292
VOLUNTARY CONTEXT SWITCHES (RUN): 37
INVOLUNTARY CONTEXT SWITCHES (RUN): 17

29
share/trick/trickops/tests/send_hs.nominal Normal file
View File

@ -0,0 +1,29 @@
|L 3|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Failed to resolve parameter 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable'
|L 2|2024/11/21,15:54:06|myworkstation| |T 0|0.000000| TrickParamCopy(UserCodeExample): Mismatched data types for 'fsw_out.fswOut_block.fswOut.fsw1HzOut.domain.subdomain.variable' -> 'another_structure.myvariable'
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.flexMode.
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable flex.flex_Obj.myarray[0].
|L 2|2024/11/21,15:54:07|myworkstation| |T 0|0.000000| Could not find Data Record variable foo.bar.yippy.skippy.axial_sep_distance.
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
REALTIME SHUTDOWN STATS:
ACTUAL INIT TIME: 42.606
ACTUAL ELAPSED TIME: 55.551
|L 0|2024/11/21,15:54:20|myworkstation| |T 0|68.955000|
SIMULATION TERMINATED IN
PROCESS: 0
ROUTINE: Executive_loop_single_thread.cpp:98
DIAGNOSTIC: Reached termination time
SIMULATION START TIME: 0.000
SIMULATION STOP TIME: 68.955
SIMULATION ELAPSED TIME: 68.955
USER CPU TIME USED: 55.690
SYSTEM CPU TIME USED: 0.935
SIMULATION / CPU TIME: 1.218
INITIALIZATION USER CPU TIME: 42.783
INITIALIZATION SYSTEM CPU TIME: 0.901
SIMULATION RAM USAGE: 1198.867MB
(External program RAM usage not included!)
VOLUNTARY CONTEXT SWITCHES (INIT): 792
INVOLUNTARY CONTEXT SWITCHES (INIT): 187
VOLUNTARY CONTEXT SWITCHES (RUN): 97
INVOLUNTARY CONTEXT SWITCHES (RUN): 14

3
share/trick/trickops/tests/test.py
View File

@ -5,6 +5,7 @@
import os, sys, pdb
import unittest
import ut_send_hs
import ut_WorkflowCommon
import ut_TrickWorkflowYamlVerifier
import ut_TrickWorkflow
@ -14,6 +15,7 @@ import ut_MonteCarloGenerationHelper
def load_tests(*args):
passed_args = locals()
suite = unittest.TestSuite()
suite.addTests(ut_send_hs.suite())
suite.addTests(ut_TrickWorkflowYamlVerifier.suite())
suite.addTests(ut_TrickWorkflow.suite())
suite.addTests(ut_WorkflowCommon.suite())
@ -23,6 +25,7 @@ def load_tests(*args):
# Local module level execution only
if __name__ == '__main__':
suites = unittest.TestSuite()
suites.addTests(ut_send_hs.suite())
suites.addTests(ut_TrickWorkflowYamlVerifier.suite())
suites.addTests(ut_TrickWorkflow.suite())
suites.addTests(ut_WorkflowCommon.suite())

216
share/trick/trickops/tests/ut_send_hs.py Normal file
View File

@ -0,0 +1,216 @@
import os, sys, glob
import unittest, shutil
import pdb
from testconfig import this_trick, tests_dir
import send_hs
def suite():
"""Create test suite from test cases here and return"""
suites = []
suites.append(unittest.TestLoader().loadTestsFromTestCase(SendHsTestCase))
suites.append(unittest.TestLoader().loadTestsFromTestCase(SendHsNoFileTestCase))
suites.append(unittest.TestLoader().loadTestsFromTestCase(SendHsMissingAllTestCase))
suites.append(unittest.TestLoader().loadTestsFromTestCase(SendHsMissingSomeTestCase))
suites.append(unittest.TestLoader().loadTestsFromTestCase(SendHsVerifyDiagNames))
return (suites)
class SendHsTestCase(unittest.TestCase):
def setUp(self):
# Nominal - reading a valid send_hs output file
self.instance = send_hs.send_hs(hs_file=os.path.join(tests_dir, 'send_hs.nominal'))
self.assertEqual(self.instance.missing_diagnostics(), [])
def tearDown(self):
if self.instance:
del self.instance
self.instance = None
def assert_values(self, instance):
self.assertEqual(instance.hs_file, os.path.join(tests_dir, 'send_hs.nominal'))
self.assertEqual(instance.num_lines, 29)
# Test the values of each individual diagnostic name
self.assertEqual(instance.get('ACTUAL INIT TIME'), 42.606)
self.assertEqual(instance.get('ACTUAL INIT'), 42.606) # Partial name test
self.assertEqual(instance.get('ACTUAL ELAPSED TIME'), 55.551)
self.assertEqual(instance.get('SIMULATION START TIME'), 0.0)
self.assertEqual(instance.get('SIMULATION STOP TIME'), 68.955)
self.assertEqual(instance.get('SIMULATION ELAPSED TIME'), 68.955)
self.assertEqual(instance.get('USER CPU TIME USED'), 55.690 )
self.assertEqual(instance.get('SYSTEM CPU TIME USED'), 0.935)
self.assertEqual(instance.get('SIMULATION / CPU TIME'), 1.218)
self.assertEqual(instance.get('INITIALIZATION USER CPU TIME'), 42.783 )
self.assertEqual(instance.get('INITIALIZATION SYSTEM CPU TIME'), 0.901)
self.assertEqual(instance.get('SIMULATION RAM USAGE'), 1198.867)
self.assertEqual(instance.get('VOLUNTARY CONTEXT SWITCHES (INIT)'), 792)
self.assertEqual(instance.get('VOLUNTARY CONTEXT SWITCHES'), 792) # Partial name test
self.assertEqual(instance.get('INVOLUNTARY CONTEXT SWITCHES (INIT)'), 187)
self.assertEqual(instance.get('VOLUNTARY CONTEXT SWITCHES (RUN)'), 97)
self.assertEqual(instance.get('INVOLUNTARY CONTEXT SWITCHES (RUN)'), 14 )
self.assertEqual(instance.is_valid(), True)
self.assertEqual(instance.missing_diagnostics(), [])
# Test the values of the full dict
diags = self.instance.get_diagnostics()
self.assertEqual(diags['ACTUAL INIT TIME'], 42.606)
self.assertEqual(diags['ACTUAL ELAPSED TIME'], 55.551)
self.assertEqual(diags['SIMULATION START TIME'], 0.0)
self.assertEqual(diags['SIMULATION STOP TIME'], 68.955)
self.assertEqual(diags['SIMULATION ELAPSED TIME'], 68.955)
self.assertEqual(diags['USER CPU TIME USED'], 55.690 )
self.assertEqual(diags['SYSTEM CPU TIME USED'], 0.935)
self.assertEqual(diags['SIMULATION / CPU TIME'], 1.218)
self.assertEqual(diags['INITIALIZATION USER CPU TIME'], 42.783 )
self.assertEqual(diags['INITIALIZATION SYSTEM CPU TIME'], 0.901)
self.assertEqual(diags['SIMULATION RAM USAGE'], 1198.867)
self.assertEqual(diags['VOLUNTARY CONTEXT SWITCHES (INIT)'], 792)
self.assertEqual(diags['INVOLUNTARY CONTEXT SWITCHES (INIT)'], 187)
self.assertEqual(diags['VOLUNTARY CONTEXT SWITCHES (RUN)'], 97)
self.assertEqual(diags['INVOLUNTARY CONTEXT SWITCHES (RUN)'], 14 )
# Test the other way to get diagnostics and ensure we get the same result
diags2 = self.instance.diagnostics
self.assertEqual(diags, diags2 )
def test_get_unknown_diag(self):
with self.assertRaises(LookupError):
self.instance.get('fake_diag_name')
def test_init(self):
# Init happened in setUp, make sure values are right
self.assert_values(self.instance)
def test_twostep_init(self):
# Construct without giving the instance a file to parse
self.tsi = send_hs.send_hs()
# Everything is None before the file has been parsed
for d in self.tsi._diagnostics:
self.assertEqual(self.tsi._diagnostics[d], None)
# Parse the file after construction
self.tsi = send_hs.send_hs('send_hs.nominal')
# Make sure values are right
self.assert_values(self.instance)
class SendHsNoFileTestCase(unittest.TestCase):
def setUp(self):
# No-file constructions
self.instance = send_hs.send_hs()
def test_init(self):
with self.assertRaises(RuntimeError):
self.instance.parse() # Nothing to parse, no file given
class SendHsMissingAllTestCase(unittest.TestCase):
def setUp(self):
# Invalid - reading a send_hs file missing all expected output
self.instance = send_hs.send_hs(hs_file=os.path.join(tests_dir, 'send_hs.missing_all'))
def tearDown(self):
if self.instance:
del self.instance
self.instance = None
def test_init(self):
self.assertEqual(self.instance.num_lines, 5)
self.assertEqual(self.instance.is_valid(), False)
self.assertEqual(self.instance.missing_diagnostics(), [
'ACTUAL INIT TIME',
'ACTUAL ELAPSED TIME',
'SIMULATION START TIME',
'SIMULATION STOP TIME',
'SIMULATION ELAPSED TIME',
'USER CPU TIME USED',
'SYSTEM CPU TIME USED',
'SIMULATION / CPU TIME',
'INITIALIZATION USER CPU TIME',
'INITIALIZATION SYSTEM CPU TIME',
'SIMULATION RAM USAGE',
'VOLUNTARY CONTEXT SWITCHES (INIT)',
'INVOLUNTARY CONTEXT SWITCHES (INIT)',
'VOLUNTARY CONTEXT SWITCHES (RUN)',
'INVOLUNTARY CONTEXT SWITCHES (RUN)'
])
class SendHsMissingSomeTestCase(unittest.TestCase):
def setUp(self):
# Invalid - reading a send_hs file missing all expected output
self.instance = send_hs.send_hs(hs_file=os.path.join(tests_dir, 'send_hs.missing_some'))
def tearDown(self):
if self.instance:
del self.instance
self.instance = None
def test_init(self):
self.assertEqual(self.instance.num_lines, 26)
self.assertEqual(self.instance.is_valid(), False)
self.assertEqual(self.instance.missing_diagnostics(), [
'USER CPU TIME USED',
'INITIALIZATION SYSTEM CPU TIME',
'INVOLUNTARY CONTEXT SWITCHES (INIT)',
])
self.assertEqual(self.instance.get('ACTUAL INIT TIME'), 32.306)
self.assertEqual(self.instance.get('ACTUAL INIT'), 32.306) # Partial name test
self.assertEqual(self.instance.get('ACTUAL ELAPSED TIME'), 35.551)
self.assertEqual(self.instance.get('SIMULATION START TIME'), -10.00)
self.assertEqual(self.instance.get('SIMULATION STOP TIME'), 78.955)
self.assertEqual(self.instance.get('SIMULATION ELAPSED TIME'), 88.955)
self.assertEqual(self.instance.get('SYSTEM CPU TIME USED'), 3.235)
self.assertEqual(self.instance.get('SIMULATION / CPU TIME'), 9.218)
self.assertEqual(self.instance.get('INITIALIZATION USER CPU TIME'), 72.763 )
self.assertEqual(self.instance.get('SIMULATION RAM USAGE'), 193.867)
self.assertEqual(self.instance.get('VOLUNTARY CONTEXT SWITCHES (INIT)'), 292)
self.assertEqual(self.instance.get('VOLUNTARY CONTEXT SWITCHES'), 292) # Partial name test
self.assertEqual(self.instance.get('VOLUNTARY CONTEXT SWITCHES (RUN)'), 37)
self.assertEqual(self.instance.get('INVOLUNTARY CONTEXT SWITCHES (RUN)'), 17 )
class SendHsVerifyDiagNames(unittest.TestCase):
'''
This test is bonkers. Here we search for the keys in the self._diagnostics (which
contain the text patterns we expect in the send_hs message) in the tracked source
code of Trick. This test should fail if the diagnostics are ever changed in name.
The other way to do this would be to ingest a real send_hs generated from a
sim built and run before these tests run, but that adds significant complexity
and a new dependency to this unit testing -Jordan 12/2024
'''
def setUp(self):
# An empty instance is all we need since the diag keys are baked into the class
self.instance = send_hs.send_hs()
self.files_to_search = [
os.path.join(this_trick, "trick_source/sim_services/Executive/Executive_shutdown.cpp"),
os.path.join(this_trick, "trick_source/sim_services/RealtimeSync/RealtimeSync.cpp"),
]
self.the_code = []
for source_file in self.files_to_search:
with open(source_file, 'r') as f:
self.the_code += f.readlines()
def tearDown(self):
if self.instance:
del self.instance
self.instance = None
def test_verify_diags(self):
# Look for the diagnostic text in the files to search, and note
# that they are FOUND if they are
for d in self.instance.keys():
if self.instance._diagnostics[d] == 'FOUND':
continue
for line in self.the_code:
if d in line:
self.instance._diagnostics[d] = 'FOUND'
break
diags = self.instance.diagnostics
# Assert that all expected text was found in the source code
for d in diags:
self.assertEqual(diags[d], 'FOUND')

6
trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp
View File

@ -163,13 +163,13 @@ void FieldDescription::parseComment(std::string comment) {
comment = get_regex_field(comment , "(.*)@?trick_io[\\({]([^\\)}]+)[\\)}]" , 1) +
get_regex_field(comment , "@?trick_io[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
}
ret_str = get_regex_field(comment , "@?io[\\({]([^\\)}]+)[\\)}]" , 1) ;
ret_str = get_regex_field(comment , "(^|[^*])@?io[\\({]([^\\)}]+)[\\)}]" , 2) ;
if ( ! ret_str.empty()) {
io = io_map[ret_str] ;
if(debug_level >= 4) std::cout << "go for io " << io << std::endl ;
io_found = true ;
comment = get_regex_field(comment , "(.*)@?io[\\({]([^\\)}]+)[\\)}]" , 1) +
get_regex_field(comment , "@?io[\\({]([^\\)}]+)[\\)}](.*)" , 2) ;
comment = get_regex_field(comment , "(.*)(^|[^*])@?io[\\({]([^\\)}]+)[\\)}]" , 1) +
get_regex_field(comment , "(^|[^*])@?io[\\({]([^\\)}]+)[\\)}](.*)" , 3) ;
}
/*

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ../..

2
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ../..

2
trick_source/data_products/DPX/DPC/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ..

2
trick_source/data_products/DPX/DPM/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
DPX_DIR = ..

2
trick_source/data_products/EQParse/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc
CC = gcc
OBJ_DIR = object_${TRICK_HOST_CPU}
LIBDIR = ../lib_${TRICK_HOST_CPU}

2
trick_source/data_products/units/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc
CC = gcc
CPP = c++
ifndef TRICK_HOST_CPU

443
trick_source/java/src/main/java/trick/common/ui/panels/FindBar.java
View File

@ -1,4 +1,3 @@
//========================================
// Package
//========================================
@ -8,190 +7,282 @@ package trick.common.ui.panels;
//Imports
//========================================
import java.awt.Color;
import java.awt.Component;
import java.awt.FlowLayout;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.SwingConstants;
import org.jdesktop.swingx.AbstractPatternPanel;
import org.jdesktop.swingx.JXFindBar;
import org.jdesktop.swingx.JXFindPanel;
import org.jdesktop.swingx.search.Searchable;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.jdesktop.swingx.JXEditorPane;
/**
* A {@link JXFindBar} that is for allowing users to input search text.
*
* @since Trick 10
* A {@link JXFindBar} that allows users to input search text.
* This class extends JXFindBar, a SwingX component providing search bar functionality for a JXEditorPane.
*
* Notes for not extending JXFindBar:
* JXFindBar is a SwingX component extending JXFindPanel.
* JXFindPanel offers various search options, allowing users to input search text.
* When JXFindPanel performs a search, it calls the search method in the Searchable object.
* The Searchable search method is invoked when findNext or findPrevious is clicked.
* The JXEditorPane's Matcher calls toMatchResult() where the search text is used to find the match.
* The toMatchResult method is called in the Matcher class and creates a new Matcher, copying the state over.
* The toMatchResult method returns a {@link MatchResult} object.
* This works until JDK 9.
* JDK 9 introduces a new, non-public {@link java.util.regex.Matcher$ImmutableMatchResult} class that is the result of toMatchResult().
* Therefore, a Matcher can't be cloned and the state can't be copied over. The following exception would be seen:
* java.lang.ClassCastException: class java.util.regex.Matcher$ImmutableMatchResult cannot be cast to class java.util.regex.Matcher
* (java.util.regex.Matcher$ImmutableMatchResult and java.util.regex.Matcher are in module java.base of loader 'bootstrap')
*
* @since Trick 19
* This class no longer extends JXFindBar. It extends {@link JPanel} instead.
* FindBar is a custom JPanel that provides search functionality for a JXEditorPane.
* It allows users to search for text within the editor pane and navigate through the matches.
*
* <p>Usage example:</p>
* <pre>
* {@code
* JXEditorPane editorPane = new JXEditorPane();
* FindBar findBar = new FindBar(editorPane);
* }
* </pre>
*/
public class FindBar extends JXFindBar implements ActionListener{
//========================================
// Public data
//========================================
//========================================
// Protected data
//========================================
public class FindBar extends JPanel {
//========================================
// Private Data
//=======================================
private static final long serialVersionUID = 9092192049485321408L;
/** The initial search text for this find bar */
private String initialSearchText = null;
/** By default, this would not have search options as JXFindPanel, true otherwise. */
private boolean hasOptions = false;
// TODO: add pattern support
//private JCheckBox anchorCheck;
//========================================
// Constructors
//========================================
/**
* Default constructor.
*/
public FindBar() {
super();
setNotFoundForegroundColor();
}
// ========================================
// Public data
// ========================================
/**
* The constructor that specifies total number of popup menus for the panel.
*
* @param searchable An instance of {@link Searchable} from a gui component which
* this search bar is for.
*/
public FindBar(Searchable searchable) {
super(searchable);
setNotFoundForegroundColor();
}
//========================================
// Set/Get methods
//========================================
/**
* Gets to see if case sensitive is checked.
* @return true or false
*/
public boolean isCaseSensitive() {
return getPatternModel().isCaseSensitive();
}
/**
* Sets whether to have the options as {@link JXFindPanel}.
* @param b true or false
*/
public void setOptions(boolean b) {
hasOptions = b;
}
/**
* Updates the searchField that is defined in parent class {@link AbstractPatternPanel}
* if there is initial search text is defined.
* @param searchText searchText
*/
public void updateSearchField(String searchText) {
initialSearchText = searchText;
if (searchField != null) {
searchField.setText(searchText);
}
}
/**
* Gets the current search text shown in searchField.
* @return the text
*/
public String getSearchText() {
if (searchField != null) {
return searchField.getText();
}
return null;
}
/**
* Helper method for changing the forground color when the text is not found.
* Since notFoundForegroundColor is proteced in {@link JXFindBar}, extending
* it is the only way to be able to change it.
*
*/
private void setNotFoundForegroundColor() {
notFoundForegroundColor = Color.red;
}
//========================================
// Methods
//========================================
@Override
protected void build() {
if (hasOptions) {
buildBarWithOption();
} else {
buildBar();
}
if (initialSearchText != null) {
updateSearchField(initialSearchText);
}
}
private void buildBar() {
setLayout(new FlowLayout(SwingConstants.LEADING));
add(searchLabel);
add(new JLabel(":"));
add(new JLabel(" "));
// ========================================
// Protected data
// ========================================
// ========================================
// Private Data
// =======================================
/**
* A text field for entering search queries.
*/
private JTextField searchField;
/**
* A button that, when pressed, triggers the action to find the next occurrence
* of the search term in the text or document.
*/
private JButton findNextButton;
/**
* JButton used to trigger the action of finding the previous occurrence
* in a search operation within the UI.
*/
private JButton findPreviousButton;
/**
* The JXEditorPane component used for displaying and editing text content.
*/
private JXEditorPane editorPane;
/**
* A list of integer positions.
* This list stores the positions of all find matches.
*/
private List<Integer> matchPosList;
/**
* A list of integers representing the lengths of each find match.
*/
private List<Integer> matchLenList;
/**
* The current index used for tracking the position within a list or array.
* This variable is typically used to keep track of the current item being
* processed or displayed.
*/
private int currentIndex;
// ========================================
// Constructors
// ========================================
/**
* Constructs a new FindBar with the specified JXEditorPane.
*
* <p>
* The FindBar consists of a JTextField for entering the search text, and two buttons
* for navigating to the next and previous matches. It also highlights the current match
* in the editor pane.
* </p>
*
* <p>
* Features:
* </p>
* <ul>
* <li>Real-time search and highlight as the user types in the search field.</li>
* <li>Navigation buttons to find the next and previous matches.</li>
* </ul>
*
* @param editorPane The JXEditorPane in which the search will be performed.
*/
public FindBar(JXEditorPane editorPane) {
this.editorPane = editorPane;
setLayout(new FlowLayout(FlowLayout.LEFT));
searchField = new JTextField(20);
findNextButton = new JButton("Find Next");
findPreviousButton = new JButton("Find Previous");
// Add a DocumentListener to the search field to trigger search and highlight on
// text change as real-time search.
// The search field background color is set to red if no matches are found
// otherwise it is set to white.
searchField.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
searchAndHighlight();
}
@Override
public void removeUpdate(DocumentEvent e) {
searchAndHighlight();
}
@Override
public void changedUpdate(DocumentEvent e) {
searchAndHighlight();
}
private void searchAndHighlight() {
String searchText = searchField.getText();
findMatches(searchText);
highlightCurrentMatch();
if (matchPosList == null || matchPosList.isEmpty()) {
searchField.setBackground(Color.RED);
} else {
searchField.setBackground(Color.WHITE);
}
}
});
// Add an ActionListener to the search field to trigger search and highlight on Enter key press.
searchField.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
String searchText = searchField.getText();
findMatches(searchText);
highlightCurrentMatch();
}
});
// Add ActionListeners to the find next button.
findNextButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (matchPosList != null && !matchPosList.isEmpty()) {
currentIndex = (currentIndex + 1) % matchPosList.size();
highlightCurrentMatch();
}
}
});
// Add ActionListeners to the find previous button.
findPreviousButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (matchPosList != null && !matchPosList.isEmpty()) {
currentIndex = (currentIndex - 1 + matchPosList.size()) % matchPosList.size();
highlightCurrentMatch();
}
}
});
add(new JLabel("Find:"));
add(searchField);
add(findNext);
add(findPrevious);
}
private void buildBarWithOption() {
//anchorCheck = new JCheckBox("Anchor");
//anchorCheck.addActionListener(this);
wrapCheck = new JCheckBox();
backCheck = new JCheckBox();
Box lBox = new Box(BoxLayout.LINE_AXIS);
//lBox.add(anchorCheck);
lBox.add(matchCheck);
lBox.add(wrapCheck);
lBox.add(backCheck);
lBox.setAlignmentY(Component.TOP_ALIGNMENT);
Box mBox = new Box(BoxLayout.LINE_AXIS);
mBox.add(searchLabel);
mBox.add(new JLabel(": "));
mBox.add(searchField);
mBox.add(findNext);
mBox.add(findPrevious);
mBox.setAlignmentY(Component.TOP_ALIGNMENT);
add(findNextButton);
add(findPreviousButton);
}
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
add(lBox);
add(mBox);
}
public void actionPerformed(ActionEvent e) {
/*if (e.getSource() == anchorCheck) {
if (anchorCheck.isSelected()) {
getPatternModel().setRegexCreatorKey(PatternModel.REGEX_ANCHORED);
} else {
getPatternModel().setMatchRule(PatternModel.REGEX_MATCH_RULES);
}
}*/
}
}
// ========================================
// Set/Get methods
// ========================================
// ========================================
// Methods
// ========================================
/**
* Finds and highlights all matches of the given search text in the editor pane.
*
* @param searchText The text to search for within the editor pane.
* @throws PatternSyntaxException If the regular expression's syntax is invalid.
* @throws BadLocationException If the document's text cannot be retrieved.
*/
private void findMatches(String searchText) {
try {
Highlighter highlighter = editorPane.getHighlighter();
Highlighter.HighlightPainter painter = new DefaultHighlighter.DefaultHighlightPainter(Color.YELLOW);
highlighter.removeAllHighlights();
Document doc = editorPane.getDocument();
String text = doc.getText(0, doc.getLength());
matchPosList = new ArrayList<>();
matchLenList = new ArrayList<>();
Pattern pattern = Pattern.compile(searchText, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(text);
// Find all matches of the search text in the document.
// Add the start to matchPosList and the length to matchLenList.
while (matcher.find()) {
matchPosList.add(matcher.start());
matchLenList.add(matcher.end() - matcher.start());
}
// Reset the current index to 0 and highlight the first match if available.
currentIndex = 0;
if (!matchPosList.isEmpty()) {
// Highlight the current match.
int pos = matchPosList.get(currentIndex);
highlighter.addHighlight(pos, pos + matchLenList.get(currentIndex), painter);
// Set the caret position to the start of the current match.
editorPane.setCaretPosition(pos);
}
} catch (PatternSyntaxException e) {
JOptionPane.showMessageDialog(this, "Invalid regular expression: " + e.getDescription(), "Error",
JOptionPane.ERROR_MESSAGE);
} catch (BadLocationException e) {
e.printStackTrace();
}
}
/**
* Highlights the current match in the editor pane.
*
* This method uses the Highlighter to highlight the text in the editor pane
* that matches the current search term. It removes any existing highlights
* before applying the new highlight. If there are positions available in the
* list, it highlights the text at the current index position and sets the
* caret position to the start of the highlighted text.
*
* @throws BadLocationException if the position is invalid in the document model
*/
private void highlightCurrentMatch() {
try {
Highlighter highlighter = editorPane.getHighlighter();
Highlighter.HighlightPainter painter = new DefaultHighlighter.DefaultHighlightPainter(Color.YELLOW);
highlighter.removeAllHighlights();
if (matchPosList != null && !matchPosList.isEmpty()) {
int pos = matchPosList.get(currentIndex);
// Highlight the current match.
highlighter.addHighlight(pos, pos + searchField.getText().length(), painter);
// Set the caret position to the start of the current match.
editorPane.setCaretPosition(pos);
}
} catch (BadLocationException e) {
e.printStackTrace();
}
}
}

2
trick_source/java/src/main/java/trick/sie/SieApplication.java
View File

@ -444,7 +444,7 @@ public class SieApplication extends TrickApplication implements TreeSelectionLis
contentPane.setEditable(false);
contentPane.setContentType("text/html");
FindBar findBar = new FindBar(contentPane.getSearchable());
FindBar findBar = new FindBar(contentPane);
contentPanel.add(findBar, BorderLayout.SOUTH);
// Add all the desired components to the comp

4
trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
View File

@ -1207,7 +1207,9 @@ public class SimControlApplication extends TrickApplication implements PropertyC
Font font = new Font("Monospaced", Font.PLAIN, curr_font_size);
statusMsgPane.setFont(font);
JPanel statusMsgPanel = UIUtils.createSearchableTitledPanel("Status Messages", statusMsgPane, new FindBar(statusMsgPane.getSearchable()));
// Create a customized search bar for the status message pane.
FindBar findBar = new FindBar(statusMsgPane);
JPanel statusMsgPanel = UIUtils.createSearchableTitledPanel("Status Messages", statusMsgPane, findBar);
return statusMsgPanel;
}

2
trick_source/sim_services/DataTypes/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf
CC = cc
CC = gcc
CPP = c++

2
trick_source/trick_utils/SAIntegrator/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}

2
trick_source/web/CivetServer/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf
CC = cc
CC = gcc
CPP = c++
CURL = curl
MV = mv

40
trick_source/web/dashboard/package-lock.json generated
View File

@ -6051,6 +6051,11 @@
"safe-buffer": "~5.1.1"
}
},
"cookie": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
},
"cookie-signature": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@ -6096,9 +6101,9 @@
"integrity": "sha512-iSPlClZP8vX7MC3/u6s3lrDuoQyhQukh5LyABJ3hvfzbQ3Yyayd4fp04zjLnfi267B/B2FkumcWWgrbban7sSA=="
},
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@ -7883,9 +7888,9 @@
}
},
"express": {
"version": "4.21.1",
"resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
"integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
"version": "4.21.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
"integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
"requires": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
@ -7906,7 +7911,7 @@
"methods": "~1.1.2",
"on-finished": "2.4.1",
"parseurl": "~1.3.3",
"path-to-regexp": "0.1.10",
"path-to-regexp": "0.1.12",
"proxy-addr": "~2.0.7",
"qs": "6.13.0",
"range-parser": "~1.2.1",
@ -7925,11 +7930,6 @@
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
},
"cookie": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@ -7943,6 +7943,11 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"path-to-regexp": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
},
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@ -12006,9 +12011,9 @@
}
},
"nanoid": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
"version": "3.3.8",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="
},
"native-promise-only": {
"version": "0.8.1",
@ -13063,11 +13068,6 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
},
"path-to-regexp": {
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
"integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
},
"path-type": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",