sierra-research 1.2.22__py3-none-any.whl → 1.3.5__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. sierra/__init__.py +1 -13
  2. sierra/core/__init__.py +1 -13
  3. sierra/core/cmdline.py +2 -14
  4. sierra/core/config.py +3 -14
  5. sierra/core/experiment/__init__.py +1 -13
  6. sierra/core/experiment/bindings.py +1 -13
  7. sierra/core/experiment/definition.py +1 -13
  8. sierra/core/experiment/spec.py +1 -13
  9. sierra/core/experiment/xml.py +1 -13
  10. sierra/core/generators/controller_generator_parser.py +1 -13
  11. sierra/core/generators/exp_creator.py +1 -13
  12. sierra/core/generators/exp_generators.py +1 -13
  13. sierra/core/generators/generator_factory.py +1 -13
  14. sierra/core/graphs/heatmap.py +1 -13
  15. sierra/core/graphs/scatterplot2D.py +1 -13
  16. sierra/core/graphs/stacked_line_graph.py +10 -19
  17. sierra/core/graphs/stacked_surface_graph.py +1 -13
  18. sierra/core/graphs/summary_line_graph.py +1 -13
  19. sierra/core/hpc/__init__.py +1 -13
  20. sierra/core/hpc/cmdline.py +1 -13
  21. sierra/core/logging.py +7 -28
  22. sierra/core/models/__init__.py +1 -13
  23. sierra/core/models/graphs.py +1 -14
  24. sierra/core/models/interface.py +1 -13
  25. sierra/core/pipeline/__init__.py +1 -13
  26. sierra/core/pipeline/pipeline.py +1 -13
  27. sierra/core/pipeline/stage1/__init__.py +0 -1
  28. sierra/core/pipeline/stage1/pipeline_stage1.py +1 -13
  29. sierra/core/pipeline/stage2/__init__.py +0 -1
  30. sierra/core/pipeline/stage2/exp_runner.py +5 -17
  31. sierra/core/pipeline/stage2/pipeline_stage2.py +1 -13
  32. sierra/core/pipeline/stage3/__init__.py +0 -1
  33. sierra/core/pipeline/stage3/imagizer.py +3 -14
  34. sierra/core/pipeline/stage3/pipeline_stage3.py +1 -13
  35. sierra/core/pipeline/stage3/run_collator.py +1 -13
  36. sierra/core/pipeline/stage3/statistics_calculator.py +1 -13
  37. sierra/core/pipeline/stage4/__init__.py +2 -3
  38. sierra/core/pipeline/stage4/graph_collator.py +1 -13
  39. sierra/core/pipeline/stage4/inter_exp_graph_generator.py +1 -13
  40. sierra/core/pipeline/stage4/intra_exp_graph_generator.py +1 -13
  41. sierra/core/pipeline/stage4/model_runner.py +1 -13
  42. sierra/core/pipeline/stage4/pipeline_stage4.py +1 -13
  43. sierra/core/pipeline/stage4/rendering.py +1 -13
  44. sierra/core/pipeline/stage4/yaml_config_loader.py +1 -13
  45. sierra/core/pipeline/stage5/__init__.py +0 -1
  46. sierra/core/pipeline/stage5/inter_scenario_comparator.py +1 -13
  47. sierra/core/pipeline/stage5/intra_scenario_comparator.py +1 -14
  48. sierra/core/pipeline/stage5/pipeline_stage5.py +1 -13
  49. sierra/core/platform.py +1 -13
  50. sierra/core/plugin.py +1 -13
  51. sierra/core/plugin_manager.py +1 -13
  52. sierra/core/root_dirpath_generator.py +6 -14
  53. sierra/core/ros1/__init__.py +1 -13
  54. sierra/core/ros1/callbacks.py +1 -13
  55. sierra/core/ros1/cmdline.py +1 -13
  56. sierra/core/ros1/generators.py +1 -13
  57. sierra/core/ros1/variables/__init__.py +1 -13
  58. sierra/core/ros1/variables/exp_setup.py +1 -13
  59. sierra/core/startup.py +6 -17
  60. sierra/core/stat_kernels.py +1 -13
  61. sierra/core/storage.py +1 -13
  62. sierra/core/types.py +1 -13
  63. sierra/core/utils.py +1 -13
  64. sierra/core/variables/__init__.py +1 -13
  65. sierra/core/variables/base_variable.py +1 -13
  66. sierra/core/variables/batch_criteria.py +1 -13
  67. sierra/core/variables/exp_setup.py +1 -13
  68. sierra/core/variables/population_size.py +1 -13
  69. sierra/core/variables/variable_density.py +1 -13
  70. sierra/core/vector.py +1 -13
  71. sierra/main.py +25 -14
  72. sierra/plugins/__init__.py +1 -13
  73. sierra/plugins/hpc/__init__.py +1 -13
  74. sierra/plugins/hpc/adhoc/__init__.py +1 -13
  75. sierra/plugins/hpc/adhoc/plugin.py +1 -13
  76. sierra/plugins/hpc/local/__init__.py +1 -13
  77. sierra/plugins/hpc/local/plugin.py +1 -13
  78. sierra/plugins/hpc/pbs/__init__.py +1 -13
  79. sierra/plugins/hpc/pbs/plugin.py +1 -13
  80. sierra/plugins/hpc/slurm/__init__.py +1 -13
  81. sierra/plugins/hpc/slurm/plugin.py +1 -13
  82. sierra/plugins/platform/__init__.py +1 -13
  83. sierra/plugins/platform/argos/__init__.py +1 -13
  84. sierra/plugins/platform/argos/cmdline.py +1 -13
  85. sierra/plugins/platform/argos/generators/__init__.py +1 -13
  86. sierra/plugins/platform/argos/generators/platform_generators.py +1 -13
  87. sierra/plugins/platform/argos/plugin.py +7 -15
  88. sierra/plugins/platform/argos/variables/__init__.py +1 -13
  89. sierra/plugins/platform/argos/variables/arena_shape.py +1 -13
  90. sierra/plugins/platform/argos/variables/cameras.py +1 -13
  91. sierra/plugins/platform/argos/variables/constant_density.py +1 -13
  92. sierra/plugins/platform/argos/variables/exp_setup.py +1 -13
  93. sierra/plugins/platform/argos/variables/physics_engines.py +1 -13
  94. sierra/plugins/platform/argos/variables/population_constant_density.py +1 -13
  95. sierra/plugins/platform/argos/variables/population_size.py +1 -13
  96. sierra/plugins/platform/argos/variables/population_variable_density.py +1 -13
  97. sierra/plugins/platform/argos/variables/rendering.py +1 -13
  98. sierra/plugins/platform/ros1gazebo/__init__.py +1 -13
  99. sierra/plugins/platform/ros1gazebo/cmdline.py +1 -13
  100. sierra/plugins/platform/ros1gazebo/generators/__init__.py +1 -13
  101. sierra/plugins/platform/ros1gazebo/generators/platform_generators.py +1 -13
  102. sierra/plugins/platform/ros1gazebo/plugin.py +1 -13
  103. sierra/plugins/platform/ros1gazebo/variables/__init__.py +1 -13
  104. sierra/plugins/platform/ros1gazebo/variables/population_size.py +1 -13
  105. sierra/plugins/platform/ros1robot/__init__.py +1 -13
  106. sierra/plugins/platform/ros1robot/cmdline.py +1 -13
  107. sierra/plugins/platform/ros1robot/generators/__init__.py +1 -13
  108. sierra/plugins/platform/ros1robot/generators/platform_generators.py +1 -13
  109. sierra/plugins/platform/ros1robot/plugin.py +1 -13
  110. sierra/plugins/platform/ros1robot/variables/__init__.py +1 -13
  111. sierra/plugins/platform/ros1robot/variables/population_size.py +1 -13
  112. sierra/plugins/robot/__init__.py +1 -13
  113. sierra/plugins/robot/turtlebot3/__init__.py +1 -13
  114. sierra/plugins/robot/turtlebot3/plugin.py +1 -13
  115. sierra/plugins/storage/__init__.py +1 -13
  116. sierra/plugins/storage/csv/__init__.py +1 -13
  117. sierra/plugins/storage/csv/plugin.py +1 -13
  118. sierra/version.py +3 -14
  119. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man1/sierra-cli.1 +6 -5
  120. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-examples.7 +1 -1
  121. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-exec-envs.7 +1 -1
  122. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-glossary.7 +1 -1
  123. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-platforms.7 +1 -1
  124. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra-usage.7 +1 -1
  125. {sierra_research-1.2.22.data → sierra_research-1.3.5.data}/data/share/man/man7/sierra.7 +1 -1
  126. sierra_research-1.3.5.dist-info/LICENSE +18 -0
  127. {sierra_research-1.2.22.dist-info → sierra_research-1.3.5.dist-info}/METADATA +10 -16
  128. sierra_research-1.3.5.dist-info/RECORD +133 -0
  129. {sierra_research-1.2.22.dist-info → sierra_research-1.3.5.dist-info}/WHEEL +1 -1
  130. sierra_research-1.2.22.dist-info/LICENSE.md +0 -674
  131. sierra_research-1.2.22.dist-info/RECORD +0 -133
  132. {sierra_research-1.2.22.dist-info → sierra_research-1.3.5.dist-info}/entry_points.txt +0 -0
  133. {sierra_research-1.2.22.dist-info → sierra_research-1.3.5.dist-info}/top_level.txt +0 -0
sierra/__init__.py CHANGED
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
 
sierra/core/__init__.py CHANGED
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
 
sierra/core/cmdline.py CHANGED
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 London Lowmanstone, John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
  """Core command line parsing and validation classes."""
18
6
 
@@ -29,7 +17,7 @@ from sierra.core import utils
29
17
 
30
18
  kVersionMsg = ("reSearch pIpEline for Reproducibility, Reusability and "
31
19
  f"Automation (SIERRA) v{sierra.version.__version__}.\n"
32
- "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
20
+ "License: MIT.\n"
33
21
  "This is free software: you are free to change and redistribute it.\n"
34
22
  "SIERRA comes with no warranty.\n\n"
35
23
 
sierra/core/config.py CHANGED
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """
17
5
  Contains all SIERRA hard-coded configuration in one place.
18
6
  """
@@ -20,6 +8,7 @@ Contains all SIERRA hard-coded configuration in one place.
20
8
  # Core packages
21
9
  import logging
22
10
  import typing as tp
11
+ import packaging
23
12
 
24
13
  # 3rd party packages
25
14
 
@@ -130,7 +119,7 @@ kRendering = {
130
119
  }
131
120
  kARGoS: tp.Dict[str, tp.Any] = {
132
121
  'physics_iter_per_tick': 10,
133
- 'min_version': 'beta53',
122
+ 'min_version': packaging.version.parse('3.0.0-beta53'),
134
123
  'launch_cmd': 'argos3',
135
124
  'launch_file_ext': '.argos',
136
125
  'n_secs_per_run': 5000, # seconds
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
 
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
  import typing as tp
@@ -1,18 +1,6 @@
1
1
  # Copyright 2022 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  """
18
6
  Functionality for reading, writing, and manipulating experiment definitions.
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
  import typing as tp
@@ -1,18 +1,6 @@
1
1
  # Copyright 2022 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  """Helper classes for XML experiment definitions.
18
6
 
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 London Lowmanstone, John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
  import typing as tp
18
6
  import argparse
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Experiment creation classes.
17
5
 
18
6
  Experiment creation takes an experiment definition `generated` by classes in
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 London Lowmanstone, John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Experiment generation classes.
17
5
 
18
6
  Experiment generation modifies the
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Factory for combining controller+scenario XML modification generators.
17
5
 
18
6
  By combining them together, the result can be easily used to apply modifications
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
 
18
6
  # Core packages
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
 
18
6
  # Core packages
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
 
18
6
  # Core packages
@@ -193,7 +181,7 @@ class StackedLineGraph:
193
181
  # which is more amenable to inclusion in academic papers.
194
182
 
195
183
  # If the legend is not specified, then we assume this is not a graph
196
- # that will contain any models.
184
+ # that will contain any models and/or no legend is desired.
197
185
  legend = self.legend
198
186
 
199
187
  if self.legend is not None:
@@ -209,21 +197,24 @@ class StackedLineGraph:
209
197
  ncol=1,
210
198
  fontsize=self.text_size['legend_label'])
211
199
  else:
212
- ax.legend(loc='lower center',
213
- bbox_to_anchor=(0.5, -0.5),
214
- ncol=1,
215
- fontsize=self.text_size['legend_label'])
200
+ ax.legend().remove()
201
+ # ax.legend(loc='lower center',
202
+ # bbox_to_anchor=(0.5, -0.5),
203
+ # ncol=1,
204
+ # fontsize=self.text_size['legend_label'])
216
205
 
217
206
  def _read_stats(self) -> tp.Dict[str, pd.DataFrame]:
218
207
  dfs = {}
208
+
219
209
  reader = storage.DataFrameReader('storage.csv')
220
210
  if self.stats in ['conf95', 'all']:
221
211
  exts = config.kStats['conf95'].exts
212
+
222
213
  for k in exts:
223
214
  ipath = self.stats_root / (self.input_stem + exts[k])
224
215
 
225
216
  if utils.path_exists(ipath):
226
- dfs[exts[k]] = reader(ipath)
217
+ dfs[k] = reader(ipath)
227
218
  else:
228
219
  self.logger.warning("%sfile not found for '%s'",
229
220
  exts[k],
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
 
18
6
  # Core packages
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  #
17
5
  """
18
6
  Linegraph for summarizing the results of a batch experiment in different ways.
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
 
17
5
  # Core packages
18
6
 
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Common cmdline classes for the various HPC plugins.
17
5
 
18
6
  """
sierra/core/logging.py CHANGED
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Extensions to the standard python ``logging`` module for SIERRA.
17
5
 
18
6
  These include:
@@ -28,25 +16,16 @@ import logging
28
16
 
29
17
  # 3rd party packages
30
18
  import coloredlogs
19
+ from haggis import logs
31
20
 
32
21
  # Project packages
33
22
 
34
- TRACE = logging.DEBUG - 5
35
-
36
-
37
- def initialize(log_level):
38
- def log_for_level(self, message, *args, **kwargs):
39
- if self.isEnabledFor(TRACE):
40
- self._log(TRACE, message, args, **kwargs)
41
-
42
- def log_to_root(message, *args, **kwargs):
43
- logging.log(TRACE, message, *args, **kwargs)
44
-
45
- logging.addLevelName(TRACE, "TRACE")
46
- setattr(logging, "TRACE", TRACE)
47
- setattr(logging.getLoggerClass(), "trace", log_for_level)
48
- setattr(logging, "trace", log_to_root)
49
23
 
24
+ def initialize(log_level: str):
25
+ logs.add_logging_level(level_name='TRACE',
26
+ level_num=logging.DEBUG - 5,
27
+ method_name=None,
28
+ if_exists=logs.RAISE)
50
29
  # Needed for static analysis (mypy and/or pylint)
51
30
  setattr(logging, '_HAS_DYNAMIC_ATTRIBUTES', True)
52
31
 
@@ -1,18 +1,6 @@
1
1
  # Copyright 2021 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  # Core packages
17
5
 
18
6
  # 3rd party packages
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """
17
5
  Graphs which can always be generated, irrespective of model specifics.
18
6
 
@@ -20,7 +8,6 @@ For example, you can always compare the model value to the empirical value, and
20
8
  plot the difference as error.
21
9
  """
22
10
  # Core packages
23
- import os
24
11
  import pathlib
25
12
 
26
13
  # 3rd party packages
@@ -1,18 +1,6 @@
1
1
  # Copyright 2020 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """Interface classes for the mathematical models framework in SIERRA.
17
5
 
18
6
  Models can be run and added to any configured graph during stage 4.
@@ -1,18 +1,6 @@
1
1
  # Copyright 2022 John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  # import sierra.core.pipeline.stage1
17
5
  # import sierra.core.pipeline.stage2
18
6
  # import sierra.core.pipeline.stage3
@@ -1,18 +1,6 @@
1
1
  # Copyright 2018 London Lowmanstone, John Harwell, All rights reserved.
2
2
  #
3
- # This file is part of SIERRA.
4
- #
5
- # SIERRA is free software: you can redistribute it and/or modify it under the
6
- # terms of the GNU General Public License as published by the Free Software
7
- # Foundation, either version 3 of the License, or (at your option) any later
8
- # version.
9
- #
10
- # SIERRA is distributed in the hope that it will be useful, but WITHOUT ANY
11
- # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
12
- # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
13
- #
14
- # You should have received a copy of the GNU General Public License along with
15
- # SIERRA. If not, see <http://www.gnu.org/licenses/
3
+ # SPDX-License-Identifier: MIT
16
4
  """The 5 pipeline stages implemented by SIERRA.
17
5
 
18
6
  See :ref:`ln-sierra-usage-pipeline` for high-level documentation.
@@ -1 +0,0 @@
1
- from sierra.core.pipeline.stage1.pipeline_stage1 import PipelineStage1