mirror of
https://github.com/nasa/trick.git
synced 2025-06-01 15:10:59 +00:00
9099792947
* Provide MonteCarloGenerate capability
Intermediate commit, this squash represents all of Isaac Reaves' work
during his Fall 2022 Pathways internship tour
[skip ci]
* TrickOps: Add phase, [min-max] range, and overhaul YAML verification
* Add new "phase:" mechanism to TrickOps Runs and Builds to support
project-specific constraints on build and run ordering
- phase defaults to zero if not specified and must be between -1000
and 1000 if given.
- jobs can now optionally be requested by their phase or phase range
- See trickops/README.md for details
* Add [min-max] notation capability to run: entries and compare: entries
- [min-max] ranges provide definition of a set of runs using a common
numbering scheme in the YAML file, greatly reducing YAML file size
for monte-carlo and other zero-padded run numbering use cases
- See trickops/README.md for details
* YAML parsing changes
- Overhaul the logic which verifies YAML files for the expected
TrickOps format. This is now done in TrickWorkflowYamlVerifier and
provides much more robust error checking than previous approach
- .yaml_requirements.yml now provides the required types, ranges, and
default values as applicable to expected entries in YAML files
- valgrind: is now an sub-option to run: entries, not its own section
Users should now list their runs normallly and define their flags in
in that run's valgrind: subsection
- parallel_safety is now a per-sim parameter and not global. Users
should move their global config to the sim layer
- self.config_errors is now a list of errors. Users should now
check for empty list when using instead of True/False
* Robustify the get_koviz_report_jobs unit test to work whether koviz
exists on PATH or not
* Adjust trickops.py to use the new phase and range features
- Make it more configurable on the command-line via argparse
- Move SIM_mc_generation tests into test_sims.yml
[skip ci]
* Code review and cleanup from PR #1389
Documentation:
* Adjust documentation to fit suggested symlinked approach. Also
cleaned up duplicate images and old documentation.
* Moved the verification section out of markdown and into a PDF since it
heavily leverages formatting not available in markdown.
* Clarify a couple points on the Darwin Trick install guide
* Update wiki to clarify that data recording strings is not supported
MCG Code:
* Replace MonteCarloVariableRandomNormal::is_near_equal with new
Trick::dbl_is_near from trick team
MCG Testing:
* Reduce the set of SIM_mc_generation comparisons. After discussion
the trick team, we are choosing to remove all comparisons to
verif_data/ which contain random-generated numbers since
these tests cannot pass across all supported trick platforms.
* Fix the wrong rule on exlcuding -Werror for Darwin builds
of SIM_mc_generation
* Remove data recording of strings in SIM_mc_generation
Trickops:
* Replace build_command with build_args per discussion w/ Trick team
Since we only support arguments to trick-CP, replace the build_command
yaml entry with build_args
* Disable var server connection by default in SingleRun if TrickWorkflow.quiet
is True
* Guard against multiple Job starts
* Remove SimulationJob inheritance layer since old monte-carlo wasn't
and never will be supported by TrickOps
* Ignore IOError raise from variable_server that looks like "The remote
endpoint has closed the connection". This appears to occur when
SingleRun jobs attempt to connect to the var server for a sim that
terminates very early
[skip ci]
* Adjust phasing of old/new MCG initialize functions
* Clarify failure message in generate_dispersions if new/old MC are both
used.
* Adjust the phasing order of MCG intialize method to be before
legacy MC initialized. Without this, monte-carlo dry run completes with
success before the check in generate_dispersions() can run
* Add -Wno-stringop-truncation to S_override.mk for SIM_mc_generation
since gcc 8+ warns about SWIG generated content in top.cpp
* Introduce MonteCarloGenerationHelper python class
This new class provides an easy-to-use interface for MCG sim-module
users:
1. Run generation
2. Getting an sbatch array job suitable for SLURM
3. Getting a list of SingleRun() instances for generated runs, to be
executed locally if desired
---------
Co-authored-by: Dan Jordan <daniel.d.jordan@nasa.gov>
53 lines
2.1 KiB
C++
53 lines
2.1 KiB
C++
/*******************************TRICK HEADER******************************
|
|
PURPOSE: ( Implementation of a class to randomly pick one of a set of
|
|
character strings. These strings could represent actual string
|
|
variables, or enumerated types, or commands, or any other concept
|
|
that can be expressed as an assignment.)
|
|
|
|
ASSUMPTIONS: (The content of the selected string will be assigned as written.
|
|
Consequently, if the value is being assigned to an actual string
|
|
or char variable, the contents of the string should be enclosed
|
|
in quotes.
|
|
E.g. the string might look like: "'actual_string'" so that the
|
|
assignment would look like
|
|
variable = 'actual_string'
|
|
This is to support the use of a string to represent a non-string
|
|
variable such as an enumeration or command:
|
|
E.g. the string might look like "x * 3 + 2" to achieve:
|
|
variable = x * 3 + 2
|
|
)
|
|
|
|
|
|
LIBRARY DEPENDENCY:
|
|
(../src/mc_variable_random_string.cc)
|
|
|
|
PROGRAMMERS:
|
|
(((Gary Turner) (OSR) (October 2019) (Antares) (Initial)))
|
|
(((Isaac Reaves) (NASA) (November 2022) (Integration into Trick Core)))
|
|
**********************************************************************/
|
|
#ifndef CML_MONTE_CARLO_VARIABLE_RANDOM_STRING_HH
|
|
#define CML_MONTE_CARLO_VARIABLE_RANDOM_STRING_HH
|
|
|
|
#include "mc_variable_random_uniform.hh"
|
|
|
|
#include <random>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
class MonteCarloVariableRandomStringSet : public MonteCarloVariableRandomUniform
|
|
{
|
|
public:
|
|
std::vector< std::string> values;
|
|
MonteCarloVariableRandomStringSet( const std::string & var_name,
|
|
unsigned int seed);
|
|
|
|
virtual ~MonteCarloVariableRandomStringSet(){};
|
|
virtual void generate_assignment();
|
|
void add_string(std::string);
|
|
private: // and undefined:
|
|
MonteCarloVariableRandomStringSet(const MonteCarloVariableRandomStringSet&);
|
|
MonteCarloVariableRandomStringSet& operator = (
|
|
const MonteCarloVariableRandomStringSet&);
|
|
};
|
|
#endif
|