Release 8.7.0

TommasoBelluzzo · Mar 18, 2024 · 4c14bc5 · 4c14bc5
1 parent 86aa46e
commit 4c14bc5
Show file tree

Hide file tree

Showing 9 changed files with 3,065 additions and 3,065 deletions.
diff --git a/docs/make.bat b/docs/make.bat
@@ -1,40 +1,40 @@
-@ECHO OFF
-
-PUSHD %~dp0
-
-IF "%SPHINX_BUILD%" == "" (
-    SET SPHINX_BUILD=sphinx-build.exe
-)
-
-%SPHINX_BUILD% >NUL 2>NUL
-
-IF ERRORLEVEL 9009 (
-    ECHO.
-    ECHO.Sphinx not found, install it from:
-    ECHO.http://sphinx-doc.org/
-    ECHO.
-
-    EXIT /B 1
-)
-
-SET SPHINX_TYPE=%1
-
-IF "%SPHINX_TYPE%" == "" (
-    ECHO.
-    %SPHINX_BUILD% --help
-    ECHO.
-
-    EXIT /B 1
-)
-
-SET SOURCE_DIR=source
-SET BUILD_DIR=build
-FOR /F "TOKENS=1,* DELIMS= " %%A IN ("%*") DO SET SPHINX_OPTS=%%B
-
-DEL /S /Q %BUILD_DIR%\%SPHINX_TYPE%\* >NUL 2>NUL
-
-ECHO.
-%SPHINX_BUILD% -b %SPHINX_TYPE% %SPHINX_OPTS% %SOURCE_DIR% %BUILD_DIR%\%SPHINX_TYPE%
-ECHO.
-
+@ECHO OFF
+
+PUSHD %~dp0
+
+IF "%SPHINX_BUILD%" == "" (
+    SET SPHINX_BUILD=sphinx-build.exe
+)
+
+%SPHINX_BUILD% >NUL 2>NUL
+
+IF ERRORLEVEL 9009 (
+    ECHO.
+    ECHO.Sphinx not found, install it from:
+    ECHO.http://sphinx-doc.org/
+    ECHO.
+
+    EXIT /B 1
+)
+
+SET SPHINX_TYPE=%1
+
+IF "%SPHINX_TYPE%" == "" (
+    ECHO.
+    %SPHINX_BUILD% --help
+    ECHO.
+
+    EXIT /B 1
+)
+
+SET SOURCE_DIR=source
+SET BUILD_DIR=build
+FOR /F "TOKENS=1,* DELIMS= " %%A IN ("%*") DO SET SPHINX_OPTS=%%B
+
+DEL /S /Q %BUILD_DIR%\%SPHINX_TYPE%\* >NUL 2>NUL
+
+ECHO.
+%SPHINX_BUILD% -b %SPHINX_TYPE% %SPHINX_OPTS% %SOURCE_DIR% %BUILD_DIR%\%SPHINX_TYPE%
+ECHO.
+
 POPD
diff --git a/meta.yaml b/meta.yaml
@@ -1,57 +1,57 @@
-{% set data = load_setup_py_data(from_recipe_dir=True) %}
-{% set name = data['name'] %}
-{% set version = data['version'] %}
-{% set summary = data['description'] %}
-{% set description = data['long_description'][:data['long_description'].index('<table>')].strip() %}
-
-package:
-  name: {{ name.lower() }}
-  version: {{ version }}
-
-source:
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 679887fc30d0331457c275ebd46d2bdd9f87424c33dddf4a467046d64c1aeef7
-
-build:
-  number: 0
-  noarch: python
-  script: {{ PYTHON }} -m pip install . -vv
-
-requirements:
-  host:
-    - python {{ data['python_requires'] }}
-    - pip
-    - setuptools
-  run:
-    - python {{ data['python_requires'] }}
-{% for dep in data['install_requires'] %}
-{% if dep.lower().startswith('matplotlib') %}
-    - matplotlib-base
-{% else %}
-    - {{ dep.lower() }}
-{% endif %}
-{% endfor %}
-
-test:
-  imports:
-    - {{ name.lower() }}
-  source_files:
-    - tests/
-  requires:
-    - pytest
-  commands:
-    - pytest tests/
-
-about:
-  home: {{ data['url'] }}
-  license: {{ data['license'] }}
-  license_file: {{ data['license_files'][0] }}
-  summary: {{ summary }}
-  description: {{ description }}
-  doc_url: https://{{ name.lower() }}.readthedocs.io/
-  doc_source_url: {{ data['url'] }}/blob/master/docs/source/index.rst
-  dev_url: {{ data['url'] }}
-
-extra:
-  maintainers:
-   - TommasoBelluzzo
+{% set data = load_setup_py_data(from_recipe_dir=True) %}
+{% set name = data['name'] %}
+{% set version = data['version'] %}
+{% set summary = data['description'] %}
+{% set description = data['long_description'][:data['long_description'].index('<table>')].strip() %}
+
+package:
+  name: {{ name.lower() }}
+  version: {{ version }}
+
+source:
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
+  sha256: 62429ecad5d324d25bd650f945ea8f1af1224adec6b0967021072f8b11275434
+
+build:
+  number: 0
+  noarch: python
+  script: {{ PYTHON }} -m pip install . -vv
+
+requirements:
+  host:
+    - python {{ data['python_requires'] }}
+    - pip
+    - setuptools
+  run:
+    - python {{ data['python_requires'] }}
+{% for dep in data['install_requires'] %}
+{% if dep.lower().startswith('matplotlib') %}
+    - matplotlib-base
+{% else %}
+    - {{ dep.lower() }}
+{% endif %}
+{% endfor %}
+
+test:
+  imports:
+    - {{ name.lower() }}
+  source_files:
+    - tests/
+  requires:
+    - pytest
+  commands:
+    - pytest tests/
+
+about:
+  home: {{ data['url'] }}
+  license: {{ data['license'] }}
+  license_file: {{ data['license_files'][0] }}
+  summary: {{ summary }}
+  description: {{ description }}
+  doc_url: https://{{ name.lower() }}.readthedocs.io/
+  doc_source_url: {{ data['url'] }}/blob/master/docs/source/index.rst
+  dev_url: {{ data['url'] }}
+
+extra:
+  maintainers:
+   - TommasoBelluzzo
diff --git a/pydtmc/__init__.py b/pydtmc/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __title__ = 'PyDTMC'
-__version__ = '8.6.0'
+__version__ = '8.7.0'
 __author__ = 'Tommaso Belluzzo'
 
 __all__ = [

diff --git a/tests/fixtures/fixtures_aliases.json b/tests/fixtures/fixtures_aliases.json
@@ -1,96 +1,96 @@
-{
-  "aliased_methods_data": [
-    {
-      "p": [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]],
-      "params": {
-        "committor_probabilities": ["backward", 0, 1],
-        "conditional_probabilities": [1],
-        "expected_rewards": [4, [-2.0, -0.7, -8.0]],
-        "expected_transitions": [6, null],
-        "first_passage_probabilities": [3, 1, null],
-        "first_passage_reward": [21, 1, 0, [-4.4, 7.5, 4.8]],
-        "hitting_probabilities": [null],
-        "hitting_times": [null],
-        "mean_absorption_times": null,
-        "mean_first_passage_times_between": [0, 2],
-        "mean_first_passage_times_to": null,
-        "mean_number_visits": null,
-        "mean_recurrence_times": null,
-        "mixing_time": [null, 3, "natural"],
-        "next_state": [1, false, 7331],
-        "time_correlations": [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], null, [1, 10, 100]],
-        "time_relaxations": [[0, 1, 1, 1, 1, 0], null, [1, 10, 100]],
-        "to_bounded_chain": ["absorbing"],
-        "to_canonical_form": null,
-        "to_lazy_chain": [0.6],
-        "to_nth_order": [3],
-        "to_subchain": [[1, 2]]
-      }
-    },
-    {
-      "p": [[0.70, 0.15, 0.15], [0.15, 0.70, 0.15], [0.15, 0.15, 0.70]],
-      "params": {
-        "committor_probabilities": ["backward", 0, 2],
-        "conditional_probabilities": [0],
-        "expected_rewards": [12, [1.4, 0.0, -6.1]],
-        "expected_transitions": [32, [0.1, 0.45, 0.45]],
-        "first_passage_probabilities": [7, 0, [1, 2]],
-        "first_passage_reward": [18, 1, 2, [-1.9, 8.9, 0.0]],
-        "hitting_probabilities": [null],
-        "hitting_times": [null],
-        "mean_absorption_times": null,
-        "mean_first_passage_times_between": [0, 1],
-        "mean_first_passage_times_to": null,
-        "mean_number_visits": null,
-        "mean_recurrence_times": null,
-        "mixing_time": [null, 12, "traditional"],
-        "next_state": [1, false, 7331],
-        "time_correlations": [[0, 0, 0, 1, 2, 2, 2, 2, 2], null, 50],
-        "time_relaxations": [[0, 1, 1, 1, 1, 0], null, 50],
-        "to_bounded_chain": ["reflecting"],
-        "to_canonical_form": null,
-        "to_lazy_chain": [[0.1, 0.2, 0.1]],
-        "to_nth_order": [6],
-        "to_subchain": [[0, 2]]
-      }
-    }    ,
-    {
-      "p": [[0.0, 1.0, 0.0, 0.0, 0.0, 0.0], [0.1, 0.8, 0.0, 0.1, 0.0, 0.0], [0.3, 0.0, 0.3, 0.2, 0.2, 0.0], [0.5, 0.0, 0.0, 0.0, 0.0, 0.5], [0.2, 0.2, 0.2, 0.0, 0.2, 0.2], [0.0, 0.0, 0.0, 0.0, 0.0, 1.0]],
-      "params": {
-        "committor_probabilities": ["forward", 3, 5],
-        "conditional_probabilities": [4],
-        "expected_rewards": [1, [-0.4, 0.0, -3.9, 2.1, 3.6, 0.0]],
-        "expected_transitions": [9, null],
-        "first_passage_probabilities": [3, 0, [1, 2, 5]],
-        "first_passage_reward": [12, 0, [1, 4], [2.3, 3.2, 0.0, 2.1, 5.5, -9.2]],
-        "hitting_probabilities": [[2, 3]],
-        "hitting_times": [[0, 1, 2]],
-        "mean_absorption_times": null,
-        "mean_first_passage_times_between": [[0, 2], [1, 3]],
-        "mean_first_passage_times_to": [[0, 3, 4]],
-        "mean_number_visits": null,
-        "mean_recurrence_times": null,
-        "next_state": [1, false, 7331],
-        "mixing_time": [[0.4, 0.0, 0.2, 0.2, 0.2, 0.0], 5, "natural"],
-        "time_correlations": [[0, 1, 1, 1, 1, 0], [2, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1], [0, 1, 2, 3, 4, 5]],
-        "time_relaxations": [[0, 1, 1, 1, 1, 0], [0.0, 0.0, 0.8, 0.0, 0.0, 0.2], [0, 1, 2, 3, 4, 5]],
-        "to_bounded_chain": [0.75],
-        "to_canonical_form": null,
-        "to_lazy_chain": [0.1],
-        "to_nth_order": [2],
-        "to_subchain": [[1, 2, 3]]
-      }
-    }
-  ],
-  "aliased_properties_data": [
-    {
-      "p": [[1.0, 0.0], [0.0, 1.0]]
-    },
-    {
-      "p": [[0.0, 0.0, 1.0], [0.15, 0.70, 0.15], [0.0, 0.0, 1.0]]
-    }    ,
-    {
-      "p": [[0.3, 0.4, 0.3], [0.6, 0.2, 0.2], [0.2, 0.7, 0.1]]
-    }
-  ]
+{
+  "aliased_methods_data": [
+    {
+      "p": [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]],
+      "params": {
+        "committor_probabilities": ["backward", 0, 1],
+        "conditional_probabilities": [1],
+        "expected_rewards": [4, [-2.0, -0.7, -8.0]],
+        "expected_transitions": [6, null],
+        "first_passage_probabilities": [3, 1, null],
+        "first_passage_reward": [21, 1, 0, [-4.4, 7.5, 4.8]],
+        "hitting_probabilities": [null],
+        "hitting_times": [null],
+        "mean_absorption_times": null,
+        "mean_first_passage_times_between": [0, 2],
+        "mean_first_passage_times_to": null,
+        "mean_number_visits": null,
+        "mean_recurrence_times": null,
+        "mixing_time": [null, 3, "natural"],
+        "next_state": [1, false, 7331],
+        "time_correlations": [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], null, [1, 10, 100]],
+        "time_relaxations": [[0, 1, 1, 1, 1, 0], null, [1, 10, 100]],
+        "to_bounded_chain": ["absorbing"],
+        "to_canonical_form": null,
+        "to_lazy_chain": [0.6],
+        "to_nth_order": [3],
+        "to_subchain": [[1, 2]]
+      }
+    },
+    {
+      "p": [[0.70, 0.15, 0.15], [0.15, 0.70, 0.15], [0.15, 0.15, 0.70]],
+      "params": {
+        "committor_probabilities": ["backward", 0, 2],
+        "conditional_probabilities": [0],
+        "expected_rewards": [12, [1.4, 0.0, -6.1]],
+        "expected_transitions": [32, [0.1, 0.45, 0.45]],
+        "first_passage_probabilities": [7, 0, [1, 2]],
+        "first_passage_reward": [18, 1, 2, [-1.9, 8.9, 0.0]],
+        "hitting_probabilities": [null],
+        "hitting_times": [null],
+        "mean_absorption_times": null,
+        "mean_first_passage_times_between": [0, 1],
+        "mean_first_passage_times_to": null,
+        "mean_number_visits": null,
+        "mean_recurrence_times": null,
+        "mixing_time": [null, 12, "traditional"],
+        "next_state": [1, false, 7331],
+        "time_correlations": [[0, 0, 0, 1, 2, 2, 2, 2, 2], null, 50],
+        "time_relaxations": [[0, 1, 1, 1, 1, 0], null, 50],
+        "to_bounded_chain": ["reflecting"],
+        "to_canonical_form": null,
+        "to_lazy_chain": [[0.1, 0.2, 0.1]],
+        "to_nth_order": [6],
+        "to_subchain": [[0, 2]]
+      }
+    }    ,
+    {
+      "p": [[0.0, 1.0, 0.0, 0.0, 0.0, 0.0], [0.1, 0.8, 0.0, 0.1, 0.0, 0.0], [0.3, 0.0, 0.3, 0.2, 0.2, 0.0], [0.5, 0.0, 0.0, 0.0, 0.0, 0.5], [0.2, 0.2, 0.2, 0.0, 0.2, 0.2], [0.0, 0.0, 0.0, 0.0, 0.0, 1.0]],
+      "params": {
+        "committor_probabilities": ["forward", 3, 5],
+        "conditional_probabilities": [4],
+        "expected_rewards": [1, [-0.4, 0.0, -3.9, 2.1, 3.6, 0.0]],
+        "expected_transitions": [9, null],
+        "first_passage_probabilities": [3, 0, [1, 2, 5]],
+        "first_passage_reward": [12, 0, [1, 4], [2.3, 3.2, 0.0, 2.1, 5.5, -9.2]],
+        "hitting_probabilities": [[2, 3]],
+        "hitting_times": [[0, 1, 2]],
+        "mean_absorption_times": null,
+        "mean_first_passage_times_between": [[0, 2], [1, 3]],
+        "mean_first_passage_times_to": [[0, 3, 4]],
+        "mean_number_visits": null,
+        "mean_recurrence_times": null,
+        "next_state": [1, false, 7331],
+        "mixing_time": [[0.4, 0.0, 0.2, 0.2, 0.2, 0.0], 5, "natural"],
+        "time_correlations": [[0, 1, 1, 1, 1, 0], [2, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1], [0, 1, 2, 3, 4, 5]],
+        "time_relaxations": [[0, 1, 1, 1, 1, 0], [0.0, 0.0, 0.8, 0.0, 0.0, 0.2], [0, 1, 2, 3, 4, 5]],
+        "to_bounded_chain": [0.75],
+        "to_canonical_form": null,
+        "to_lazy_chain": [0.1],
+        "to_nth_order": [2],
+        "to_subchain": [[1, 2, 3]]
+      }
+    }
+  ],
+  "aliased_properties_data": [
+    {
+      "p": [[1.0, 0.0], [0.0, 1.0]]
+    },
+    {
+      "p": [[0.0, 0.0, 1.0], [0.15, 0.70, 0.15], [0.0, 0.0, 1.0]]
+    }    ,
+    {
+      "p": [[0.3, 0.4, 0.3], [0.6, 0.2, 0.2], [0.2, 0.7, 0.1]]
+    }
+  ]
 }