fmdtools 2.5.2__tar.gz → 2.5.3__tar.gz

{fmdtools-2.5.2 → fmdtools-2.5.3}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.5.2
+fmdtools version 2.5.3
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.5.2/fmdtools.egg-info → fmdtools-2.5.3}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.5.2
+Version: 2.5.3
 Summary: System resilience modelling, simulation, and assessment in Python
 Author: fmdtools Developers
 Maintainer-email: Daniel Hulse <daniel.e.hulse@nasa.gov>
-License: fmdtools version 2.5.2
+License: fmdtools version 2.5.3
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -394,7 +394,7 @@ More guidance on development installations is provided in [How to Contribute](ht
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` in the context of a development install you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.5.2
+   git checkout v2.5.3
 ```
 
 
@@ -548,8 +548,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.5.2},
-  date = {2026-9-28},
+  version = {2.5.3},
+  date = {2026-9-30},
 }
 ```
 

{fmdtools-2.5.2 → fmdtools-2.5.3}/README.md

@@ -123,7 +123,7 @@ More guidance on development installations is provided in [How to Contribute](ht
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` in the context of a development install you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.5.2
+   git checkout v2.5.3
 ```
 
 
@@ -277,8 +277,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.5.2},
-  date = {2026-9-28},
+  version = {2.5.3},
+  date = {2026-9-30},
 }
 ```
 

{fmdtools-2.5.2 → fmdtools-2.5.3}/examples/multirotor_drone/model_urban.py

@@ -322,6 +322,7 @@ class Drone(DroneRural):
                               ('taxi', 12, 20)),
                       end_time=30,
                       units='min',
+                      use_local=False,
                       dt=0.1)
 
     def init_architecture(self, **kwargs):
@@ -499,6 +500,9 @@ if __name__ == "__main__":
     # UrbanDroneEnvironment("a")
     # PlanPath._init_environment("a")
     # p = PlanPath("test", {})
+    mdl = Drone(sp={'end_condition': 'scenario_finished', 'dt': 0.1}, t={'local_dt': 0.1})
+    results_fault, hist_fault = propagate.one_fault(mdl, "affect_dof.ca.comps.lr", "mechbreak", time=1.4)
+    fig, ax = plot_env_with_traj_z(hist_fault, mdl, title = "Urban Drone Trajectory")
 
     e = UrbanDroneEnvironment("env")
     e.c.show({"height": {}})

{fmdtools-2.5.2 → fmdtools-2.5.3/fmdtools.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.5.2
+Version: 2.5.3
 Summary: System resilience modelling, simulation, and assessment in Python
 Author: fmdtools Developers
 Maintainer-email: Daniel Hulse <daniel.e.hulse@nasa.gov>
-License: fmdtools version 2.5.2
+License: fmdtools version 2.5.3
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -394,7 +394,7 @@ More guidance on development installations is provided in [How to Contribute](ht
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` in the context of a development install you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.5.2
+   git checkout v2.5.3
 ```
 
 
@@ -548,8 +548,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.5.2},
-  date = {2026-9-28},
+  version = {2.5.3},
+  date = {2026-9-30},
 }
 ```
 

{fmdtools-2.5.2 → fmdtools-2.5.3}/fmdtools.egg-info/SOURCES.txt

@@ -127,31 +127,49 @@ src/fmdtools/sim/scenario.py
 src/fmdtools/sim/search.py
 tests/__init__.py
 tests/common.py
+tests/test_array_differences.py
 tests/test_array_random_states.py
+tests/test_array_result_equality.py
+tests/test_bootstrap_statistic_arguments.py
 tests/test_calc_metric_ci_constant_outputs.py
 tests/test_comparison_groups.py
 tests/test_confidence_history_clipping.py
 tests/test_error_history_plots.py
+tests/test_exact_nominal_expectation.py
+tests/test_explicit_result_file_formats.py
+tests/test_exponential_rayleigh_draw_sizes.py
 tests/test_fault_sample_without_nominal.py
 tests/test_fault_time_without_traces.py
+tests/test_gamma_sampling_density.py
 tests/test_geom.py
 tests/test_graph.py
 tests/test_hierarchical.py
+tests/test_history_phase_identifiers.py
 tests/test_history_standard_deviation.py
+tests/test_independent_single_replicate_seeds.py
+tests/test_individual_result_paths.py
+tests/test_integer_draw_mass.py
 tests/test_join_phasemaps.py
 tests/test_joint_fault_weights.py
+tests/test_json_result_arrays.py
+tests/test_named_metric_rounding.py
 tests/test_nested_nominal_groups.py
 tests/test_nesting_custom_separators.py
 tests/test_packages.py
 tests/test_parameter_sample_seeds.py
 tests/test_parameter_subsampling_types.py
+tests/test_pareto_density.py
 tests/test_pathplan.py
 tests/test_phase_timestep.py
 tests/test_pruned_fault_times.py
 tests/test_result.py
+tests/test_result_folder_selection.py
 tests/test_sample.py
 tests/test_scenario.py
 tests/test_scenario_defaults.py
+tests/test_standard_t_density.py
 tests/test_table_factor_indices.py
 tests/test_time.py
-tests/test_uniform_density.py
+tests/test_uniform_density.py
+tests/test_unit_random_density.py
+tests/test_vonmises_density.py

{fmdtools-2.5.2 → fmdtools-2.5.3}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 description = "System resilience modelling, simulation, and assessment in Python"
 license = {file="LICENSE"}
 name = "fmdtools"
-version="2.5.2"
+version="2.5.3"
 readme = "README.md"
 requires-python = ">=3.12"
 

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/__init__.py

@@ -22,6 +22,6 @@ import fmdtools.sim as sim
 import fmdtools.analyze as analyze
 
 __all__ = ['analyze', 'sim', 'define']
-__version__ = '2.5.2'
+__version__ = '2.5.3'
 __copyright__ = "Copyright 2024 United States Government"
 __license__ = "Apache-2.0"

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/analyze/common.py

@@ -42,6 +42,7 @@ from matplotlib import rcParams
 import inspect
 from scipy.stats import bootstrap
 from fmdtools.define.base import filter_kwargs, round_float
+from functools import partial
 
 
 plt.rcParams['pdf.fonttype'] = 42
@@ -180,11 +181,11 @@ def create_indiv_filename(filename, indiv_id, splitchar='_'):
     --------
     >>> create_indiv_filename("hi.csv", "4")
     'hi_4.csv'
+    >>> create_indiv_filename("runs.v1/results.v2.csv", "4", splitchar="/")
+    'runs.v1/results.v2/4.csv'
     """
-    filename_parts = filename.split(".")
-    filename_parts.insert(1, '.')
-    filename_parts.insert(1, splitchar+indiv_id)
-    return "".join(filename_parts)
+    stem, extension = os.path.splitext(filename)
+    return stem + splitchar + indiv_id + extension
 
 
 def load_folder(folder, filetype):
@@ -198,20 +199,17 @@ def load_folder(folder, filetype):
     folder : str
         Name of the folder. Must be in the current directory
     filetype : str
-        Type of files in the folder ('pickle', 'csv', or 'json')
+        Type of files in the folder ('npz', 'csv', or 'json'). Other extensions
+        and subdirectories are ignored; matching files are not searched recursively.
 
     Returns
     -------
     files_to_read : list
         files to load for results/mdlhists.
     """
-    files = os.listdir(folder)
-    files_toread = []
-    for file in files:
-        read_filetype = auto_filetype(file)
-        if read_filetype == filetype:
-            files_toread.append(file)
-    return files_toread
+    return [file for file in os.listdir(folder)
+            if file.endswith('.' + filetype)
+            and os.path.isfile(os.path.join(folder, file))]
 
 
 def metric_preamble(data, dtype=None, rates=None, r_dtype=None, r_norm=False):
@@ -255,7 +253,8 @@ def calc_metric(data, method=np.average, args=(), axis=None, dtype=None,
     r_norm : bool, optional
         Whether to normalize rates. The default is False.
     round_value : bool, optional
-        Whether to round the value. Default is True.
+        Whether to round the final value, including named metrics.
+        Applied once after evaluation. Default is True.
     res : float
         Resolution to round to. Default is 1e-6.
     min_r : int
@@ -283,8 +282,9 @@ def calc_metric(data, method=np.average, args=(), axis=None, dtype=None,
     """
     if isinstance(method, str):
         method = eval("calc_"+method)
+        # Named helpers call calc_metric again; round only the final result.
         metric = method(data, args=args, axis=axis, dtype=dtype, rates=rates,
-                      r_dtype=r_dtype, r_norm=r_norm, **kwargs)
+                      r_dtype=r_dtype, r_norm=r_norm, round_value=False, **kwargs)
     else:
         vals = metric_preamble(data, dtype, rates, r_dtype, r_norm)
         metric = method(vals, *args, **filter_kwargs(method, **kwargs, axis=axis))
@@ -309,7 +309,8 @@ def calc_metric_ci(data, method=np.average, return_anyway=False, interval=None,
     axis : int
         Axis along which to calculate the confidence interval(s). The default is 0.
     **kwargs : kwargs
-        Keyword arguments to calc_metric or scipy.bootstrap.
+        Keyword arguments to the statistic, preprocessing, or scipy.bootstrap.
+        Statistic arguments are used for both the point estimate and resamples.
 
     Returns
     -------
@@ -339,15 +340,16 @@ def calc_metric_ci(data, method=np.average, return_anyway=False, interval=None,
     val = np.take(vals, [0], axis=axis)
     if "weights" in kwargs and kwargs['weights'] is not None:
         raise Exception("Weights not able to be used w- bootstrap--use rates instead.")
-    met_val = method(vals, axis=axis, **filter_kwargs(method, **kwargs))
+    statistic = partial(method, **filter_kwargs(method, **kwargs))
+    met_val = statistic(vals, axis=axis)
     vals_vary = vals == val
     # Preserve the existing policy for globally identical data.
     if not np.all(vals == vals.flat[0]):
         if np.any(np.all(vals_vary, axis=axis)):
             # use more robust/basic algorithm if some indices don't vary
-            bs = bootstrap([vals], method, axis=axis, method="basic", **bs_kwar)
+            bs = bootstrap([vals], statistic, axis=axis, method="basic", **bs_kwar)
         else:
-            bs = bootstrap([vals], method, axis=axis, **bs_kwar)
+            bs = bootstrap([vals], statistic, axis=axis, **bs_kwar)
         return met_val, bs.confidence_interval.low, bs.confidence_interval.high
     elif return_anyway:
         return met_val, met_val, met_val

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/analyze/history.py

@@ -182,6 +182,9 @@ class History(Result):
         """
         Find the values of two histories which are different.
 
+        Array-valued entries are retained when any element of their difference
+        is nonzero; the full difference array is returned.
+
         Parameters
         ----------
         other : History
@@ -195,7 +198,7 @@ class History(Result):
         """
         diff = self-other
         different = self.__class__()
-        different.data = {k: v for k, v in diff.items() if any(v)}
+        different.data = {k: v for k, v in diff.items() if np.any(v)}
         return different
 
     def copy(self):

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/analyze/phases.py

@@ -388,9 +388,9 @@ def from_hist(hist, fxn_modephases='all', dt=1.0):
         Dictionary of distict phases that the system functions pass through,
         of the form: {'fxn': PhaseMap} where each phase is defined by its
         corresponding mode in the modelhist.
-        Phases are numbered mode, mode1, mode2 for multiple modes and given a
-        corresponding phasemap {mode: {mode, mode1, mode2}} mapping modes to
-        phases for future sampling.
+        Repeated phases are numbered mode, mode1, mode2, skipping suffixes that
+        would collide with actual mode names or previously generated phase names.
+        The modephase mapping groups each mode's intervals for future sampling.
 
     Examples
     --------
@@ -411,6 +411,8 @@ def from_hist(hist, fxn_modephases='all', dt=1.0):
         fxn = k[k.index('m')-1]
         if len(modehist) != 0:
             modes = OrderedSet(modehist)
+            # Reserve actual mode names before generating repeated-phase suffixes.
+            used_phaseids = set(modes)
             modephases = dict.fromkeys(modes)
             phases_unsorted = dict()
             for mode in modes:
@@ -427,6 +429,10 @@ def from_hist(hist, fxn_modephases='all', dt=1.0):
                             startind = modeinds[i+1]
                             phasenum += 1
                             phaseid = mode+str(phasenum)
+                            while phaseid in used_phaseids:
+                                phasenum += 1
+                                phaseid = mode+str(phasenum)
+                            used_phaseids.add(phaseid)
             phases = dict(sorted(phases_unsorted.items(),
                                  key=lambda item: item[1][0]))
             if fxn_modephases == 'all' or fxn in fxn_modephases:

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/analyze/result.py

@@ -239,7 +239,8 @@ class Result(UserDict):
         Check that the two values of the dictionary are equal.
 
         Enables the syntax result1 == result2, which returns True/False depending on if
-        the keys/values are the same.
+        the keys/values are the same. Array values must have the same shape and
+        elements, without broadcasting or tolerances. NaN values remain unequal.
 
         Parameters
         ----------
@@ -274,10 +275,11 @@ class Result(UserDict):
         if self.keys() != other.keys():
             return False
         else:
-            return all([all(v == other.data.get(k, None))
-                        if isinstance(v, np.ndarray)
-                        else v == other.data.get(k, None)
-                        for k, v in self.data.items()])
+            return all(np.array_equal(v, other.data[k])
+                       if isinstance(v, np.ndarray) or
+                       isinstance(other.data[k], np.ndarray)
+                       else v == other.data[k]
+                       for k, v in self.data.items())
 
     def __sub__(self, other):
         """
@@ -324,6 +326,9 @@ class Result(UserDict):
         """
         Find the values of two results which are different.
 
+        Array-valued entries are retained when any element of their difference
+        is nonzero; the full difference array is returned.
+
         Parameters
         ----------
         other : Result
@@ -337,7 +342,7 @@ class Result(UserDict):
         """
         diff = self-other
         different = self.__class__()
-        different.data = {k: v for k, v in diff.items() if v}
+        different.data = {k: v for k, v in diff.items() if np.any(v)}
         return different
 
     def keys(self):
@@ -466,7 +471,7 @@ class Result(UserDict):
 
     def load(filename, filetype="", renest_dict=False, indiv=False):
         """Load as Result using :func:`load'."""
-        inputdict = load(filename, filetype="", renest_dict=renest_dict,
+        inputdict = load(filename, filetype=filetype, renest_dict=renest_dict,
                          indiv=indiv, Rclass=Result)
         return fromdict(Result, inputdict)
 
@@ -709,15 +714,18 @@ class Result(UserDict):
         """
         Save a given result variable (result or history) to a file filename.
 
-        Files can be saved as npz, csv, or json.
+        Files can be saved as npz, csv, or json. JSON converts arrays to
+        nested lists of Python values (or a scalar for zero-dimensional arrays).
+        Array dtype and shape metadata are not stored in JSON.
 
         Parameters
         ----------
         filename : str
             File name for the file. Can be nested in a folder if desired.
         filetype : str, optional
-            Optional specifier of file type (if not included in filename).
-            The default is "".
+            Format to write, overriding the filename extension when supplied.
+            The default "" infers the format from the extension. The exact
+            filename is used for all formats; no extension is appended.
         overwrite : bool, optional
             Whether to overwrite existing files with this name.
             The default is False.
@@ -741,8 +749,8 @@ class Result(UserDict):
                 else:
                     res_to_save = self
                 res_to_save = res_to_save.flatten()
-                np.savez(filename, **res_to_save)
-        elif filename[-4:] == '.csv':
+                np.savez(file_handle, **res_to_save)
+        elif filetype == 'csv':
             # add support for nested dict mdlhist using flatten_hist?
             variable = variable.flatten()
             with open(filename, 'w', newline='') as file_handle:
@@ -754,13 +762,13 @@ class Result(UserDict):
                     writer.writerows(zip(*variable.values()))
                 else:
                     writer.writerow([*variable.values()])
-        elif filename[-5:] == '.json':
+        elif filetype == 'json':
             with open(filename, 'w', encoding='utf8') as file_handle:
                 variable = variable.flatten()
                 new_variable = {}
                 for key in variable:
                     if isinstance(variable[key], np.ndarray):
-                        new_variable[str(key)] = [var.item() for var in variable[key]]
+                        new_variable[str(key)] = variable[key].tolist()
                     else:
                         new_variable[str(key)] = variable[key]
                 if result_id:
@@ -798,7 +806,8 @@ class Result(UserDict):
         app : SampleApproach, optional
             Approach to use for weights (via rates). The default is [].
         with_nominal : bool, optional
-            Whether to include the nominal scenario in the expectation.
+            Whether to include the scenario named exactly 'nominal' in the
+            expectation. Other names containing 'nominal' remain included.
             The default is False.
         difference_from_nominal : bool, optional
             Whether to calculated the difference of the expectation from nominal.
@@ -816,7 +825,7 @@ class Result(UserDict):
 
         nomhist = {k: v for k, v in mh.nominal.items() if is_numeric(v)}
         newhists = {k: hist for k, hist in mh.items()
-                    if not ('nominal' in k and not (with_nominal))}
+                    if with_nominal or k != 'nominal'}
         if app:
             scenario_rates = {scen.name: scen.rate for scen in app.scenarios()}
             if with_nominal:

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/define/base.py

@@ -442,7 +442,8 @@ def nan_to_x(metric, x=0.0):
 
 def gen_timerange(start_time, end_time, dt=1.0, min_r=7):
     """Generate the times in a given interval given the timestep dt."""
-    return np.round(np.arange(start_time, end_time + np.power(10.0, -min_r), dt), min_r)
+    return round_float(np.arange(start_time, end_time + np.power(10.0, -min_r), dt),
+                       res=dt, min_r=min_r)
 
 
 def get_code_attrs(obj):

{fmdtools-2.5.2 → fmdtools-2.5.3}/src/fmdtools/define/block/base.py

@@ -23,7 +23,7 @@ specific language governing permissions and limitations under the License.
 """
 
 from fmdtools.define.base import gen_timerange, is_iter, get_var, filter_kwargs
-from fmdtools.define.base import copy_dict_objs
+from fmdtools.define.base import copy_dict_objs, round_float
 from fmdtools.define.object.base import BaseObject
 from fmdtools.define.container.parameter import Parameter
 from fmdtools.define.container.time import Time
@@ -35,6 +35,8 @@ from fmdtools.analyze.graph.base import Graph
 import itertools
 import warnings
 import numpy as np
+import math
+from decimal import Decimal
 
 
 class SimParam(Parameter, readonly=True):
@@ -114,7 +116,7 @@ class SimParam(Parameter, readonly=True):
                                 ": " + str(self.phases) +
                                 " Ensure max of each phase < min of each other phase")
 
-    def get_timerange(self, start_time=None, end_time=None, min_r=7):
+    def get_timerange(self, start_time=None, end_time=None, dt=None, min_r=7):
         """
         Generate the timerange to simulate over.
 
@@ -127,7 +129,9 @@ class SimParam(Parameter, readonly=True):
             start_time = self.start_time
         if end_time is None:
             end_time = self.end_time
-        return gen_timerange(start_time, end_time, self.dt, min_r)
+        if dt is None:
+            dt = self.dt
+        return gen_timerange(start_time, end_time, dt, min_r)
 
     def get_histrange(self, start_time=0.0, end_time=None):
         """Get the history range associated with the SimParam."""
@@ -140,32 +144,45 @@ class SimParam(Parameter, readonly=True):
             histrange = self.track_times[1]
         return histrange
 
-    def get_hist_ind(self, t_ind, t):
+    def get_hist_ind(self, t_ind, t, local_dt=None):
         """
         Get the index of the history given the simulation time/index and shift.
 
+        Returns log as true if the index of the history and simulation line up, otherwise
+        the simulation is not to be logged.
+
         Examples
         --------
         >>> SimParam().get_hist_ind(2, 2.0)
-        2
+        (True, 2)
         >>> SimParam(track_times=('interval', 2)).get_hist_ind(4, 4.0)
-        2
-        """
+        (True, 2)
+        >>> SimParam().get_hist_ind(2, 2.0, 0.1)
+        (False, 1)
+        >>> SimParam().get_hist_ind(10, 2.0, 0.1)
+        (True, 1)
+        """
+        log = True
+        if local_dt is not None:
+            t_dec = Decimal(str(round_float(t_ind*local_dt, res=local_dt)))
+            dt = Decimal(str(self.dt))
+            log = t_dec % dt == 0.0
+            t_ind = math.ceil(t_dec/dt)
+
         if self.track_times[0] == 'all':
             t_ind_rec = t_ind
         elif self.track_times[0] == 'interval':
+            log = t_ind % self.track_times[1] == 0
             t_ind_rec = t_ind//self.track_times[1]
         elif self.track_times[0] == 'times':
             t_ind_rec = self.track_times[1].index(t)
         else:
             raise Exception("Invalid argument, track_times=" + str(self.track_times))
-        return t_ind_rec
+        return bool(log), t_ind_rec
 
     def get_sub_kwargs(self):
         """Get keyword arguments for contained sim from larger sim."""
         kwargs = self.asdict()
-        if not self.use_local:
-            kwargs.pop("dt")
         kwargs['end_condition'] = ""
         return kwargs
 
@@ -278,8 +295,8 @@ class Simulable(BaseObject):
 
         Returns
         -------
-        result : TYPE
-            DESCRIPTION.
+        result : Result
+            Result to return given to_return input.
         """
         result = Result()
         self.get_endclass(to_return=to_return, result=result, nomresult=nomresult,
@@ -762,7 +779,7 @@ class Simulable(BaseObject):
             if time == 'end':
                 time = self.sp.end_time
             start_time, end_time = self.t.get_sim_times(time)
-            sim_times = self.sp.get_timerange(start_time, end_time)
+            sim_times = self.sp.get_timerange(start_time, end_time, dt=self.t.dt)
             for t in sim_times:
                 if t == end_time:
                     if copy:
@@ -778,8 +795,9 @@ class Simulable(BaseObject):
                     self.set_sub_faults()
                     if inc_at == "all" or (inc_at == "time" and t == time):
                         self.inc_sim_time()
-                        t_ind = self.sp.get_hist_ind(self.t.t_ind, self.t.time)
-                        self.h.log(self, t_ind, self.t.time)
+                        log, t_ind = self.sp.get_hist_ind(self.t.t_ind, self.t.time, self.t.dt)
+                        if log:
+                            self.h.log(self, t_ind, self.t.time)
                     if self.sp.end_condition and not copy:
                         if get_var(self, self.sp.end_condition)():
                             break