mdpsolver 0.9.1__tar.gz → 0.9.2__tar.gz

{mdpsolver-0.9.1 → mdpsolver-0.9.2}/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Anders Reenberg Andersen and Jesper Fink Andersen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Anders Reenberg Andersen and Jesper Fink Andersen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{mdpsolver-0.9.1/src/mdpsolver.egg-info → mdpsolver-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdpsolver
-Version: 0.9.1
+Version: 0.9.2
 Summary: An efficient solver for Markov Decision Processes
 Author-email: Anders Reenberg Andersen <andersra@live.dk>, Jesper Fink Andersen <jfan@dtu.dk>
 Project-URL: Homepage, https://github.com/areenberg/MDPSolver
@@ -22,7 +22,7 @@ License-File: LICENSE
 * Available on PyPI.
 * Solver-engine developed in C++.
 * Available optimization algorithms: *Value iteration*, *Policy iteration*, and *Modified policy iteration*.  
-* Includes a variety of input formats available for users to choose from.
+* Includes support for sparse matrices.
 
 # Quick start guide
 
@@ -82,7 +82,7 @@ print(mdl.getPolicy())
 #[1, 1, 0]
 ```
 
-## Large transition matrix?
+## Sparse transition matrix?
 
 `mdpsolver` has three alternative formats for large and highly sparse transition probability matrices.
 

{mdpsolver-0.9.1 → mdpsolver-0.9.2}/README.md

@@ -1,131 +1,131 @@
-# `mdpsolver`: An efficient solver for Markov Decision Processes
- 
-`mdpsolver` is the Python package for deriving the policies of Markov Decision Processes (MDPs) with infinite-horizon and the expected total discounted reward optimality criterion. 
-
-## Features
-
-* Available on PyPI.
-* Solver-engine developed in C++.
-* Available optimization algorithms: *Value iteration*, *Policy iteration*, and *Modified policy iteration*.  
-* Includes a variety of input formats available for users to choose from.
-
-# Quick start guide
-
-The following shows how to get quickly started with `mdpsolver`.
-
-## Installation
-
-Download and install `mdpsolver` directly from PyPI. 
-
-```
-pip install mdpsolver
-```
-
-## Usage
-
-Start by specifying the reward function and transition probabilities as lists. The following is an example of a simple MDP containing **three states** and **two actions in each state**.
-
-```python
-#Import packages
-import mdpsolver
-
-#Rewards (3 states x 2 actions)
-#e.g. choosing second action in first state gives reward=-1
-rewards = [[5,-1],
-           [1,-2],
-           [50,0]]
-
-#Transition probabilities (3 from_states x 2 actions x 3 to_states)
-#e.g. choosing first action in third state gives a probability of 0.6 of staying in third state
-tranMatWithZeros = [[[0.9,0.1,0.0],[0.1,0.9,0.0]],
-                    [[0.4,0.5,0.1],[0.3,0.5,0.2]],
-                    [[0.2,0.2,0.6],[0.5,0.5,0.0]]]
-```
-
-Now, create the model object and insert the problem parameters.
-
-```python
-#Create model object
-mdl = mdpsolver.model()
-
-#Insert the problem parameters
-mdl.mdp(discount=0.8,
-        rewards=rewards,
-        tranMatWithZeros=tranMatWithZeros)
-```
-
-We can now optimize the policy.
-
-```python
-mdl.solve()
-```
-
-The optimized policy can be returned in a variety of ways. Here, we return the policy as a list and print directly in the terminal. 
-
-```python
-print(mdl.getPolicy())
-#[1, 1, 0]
-```
-
-## Large transition matrix?
-
-`mdpsolver` has three alternative formats for large and highly sparse transition probability matrices.
-
-**(1) Elementwise representation (excluding elements containing zeros):**
-
-```python
-#[from_state,action,to_state,probability]
-tranMatElementwise = [[0,0,0,0.9],
-                      [0,0,1,0.1],
-                      [0,1,0,0.1],
-                      [0,1,1,0.9],
-                      [1,0,0,0.4],
-                      [1,0,1,0.5],
-                      [1,0,2,0.1],
-                      [1,1,0,0.3],
-                      [1,1,1,0.5],
-                      [1,1,2,0.2],
-                      [2,0,0,0.2],
-                      [2,0,1,0.2],
-                      [2,0,2,0.6],
-                      [2,1,0,0.5],
-                      [2,1,1,0.5]]
-
-mdl.mdp(discount=0.8,
-        rewards=rewards,
-        tranMatElementwise=tranMatElementwise)
-```
-
-**(2) Probabilities and column (to_state) indices in separate lists:**
-
-```python
-tranMatProbs = [[[0.9,0.1],[0.1,0.9]],
-                [[0.4,0.5,0.1],[0.3,0.5,0.2]],
-                [[0.2,0.2,0.6],[0.5,0.5]]]
-
-tranMatColumns = [[[0,1],[0,1]],
-                [[0,1,2],[0,1,2]],
-                [[0,1,2],[0,1]]]
-
-mdl.mdp(discount=0.8,
-        rewards=rewards,
-        tranMatProbs=tranMatProbs,
-        tranMatColumns=tranMatColumns)
-
-```
-
-**(3) Load the elementwise representation from a file:**
-
-```python
-mdl.mdp(discount=0.8,
-        rewards=rewards,
-        tranMatFromFile="transitions.csv")
-```
-
-# User manual
-
-Further information can be found in the wiki for `mdpsolver` on Github.
-
-# How to cite
-
+# `mdpsolver`: An efficient solver for Markov Decision Processes
+ 
+`mdpsolver` is the Python package for deriving the policies of Markov Decision Processes (MDPs) with infinite-horizon and the expected total discounted reward optimality criterion. 
+
+## Features
+
+* Available on PyPI.
+* Solver-engine developed in C++.
+* Available optimization algorithms: *Value iteration*, *Policy iteration*, and *Modified policy iteration*.  
+* Includes support for sparse matrices.
+
+# Quick start guide
+
+The following shows how to get quickly started with `mdpsolver`.
+
+## Installation
+
+Download and install `mdpsolver` directly from PyPI. 
+
+```
+pip install mdpsolver
+```
+
+## Usage
+
+Start by specifying the reward function and transition probabilities as lists. The following is an example of a simple MDP containing **three states** and **two actions in each state**.
+
+```python
+#Import packages
+import mdpsolver
+
+#Rewards (3 states x 2 actions)
+#e.g. choosing second action in first state gives reward=-1
+rewards = [[5,-1],
+           [1,-2],
+           [50,0]]
+
+#Transition probabilities (3 from_states x 2 actions x 3 to_states)
+#e.g. choosing first action in third state gives a probability of 0.6 of staying in third state
+tranMatWithZeros = [[[0.9,0.1,0.0],[0.1,0.9,0.0]],
+                    [[0.4,0.5,0.1],[0.3,0.5,0.2]],
+                    [[0.2,0.2,0.6],[0.5,0.5,0.0]]]
+```
+
+Now, create the model object and insert the problem parameters.
+
+```python
+#Create model object
+mdl = mdpsolver.model()
+
+#Insert the problem parameters
+mdl.mdp(discount=0.8,
+        rewards=rewards,
+        tranMatWithZeros=tranMatWithZeros)
+```
+
+We can now optimize the policy.
+
+```python
+mdl.solve()
+```
+
+The optimized policy can be returned in a variety of ways. Here, we return the policy as a list and print directly in the terminal. 
+
+```python
+print(mdl.getPolicy())
+#[1, 1, 0]
+```
+
+## Sparse transition matrix?
+
+`mdpsolver` has three alternative formats for large and highly sparse transition probability matrices.
+
+**(1) Elementwise representation (excluding elements containing zeros):**
+
+```python
+#[from_state,action,to_state,probability]
+tranMatElementwise = [[0,0,0,0.9],
+                      [0,0,1,0.1],
+                      [0,1,0,0.1],
+                      [0,1,1,0.9],
+                      [1,0,0,0.4],
+                      [1,0,1,0.5],
+                      [1,0,2,0.1],
+                      [1,1,0,0.3],
+                      [1,1,1,0.5],
+                      [1,1,2,0.2],
+                      [2,0,0,0.2],
+                      [2,0,1,0.2],
+                      [2,0,2,0.6],
+                      [2,1,0,0.5],
+                      [2,1,1,0.5]]
+
+mdl.mdp(discount=0.8,
+        rewards=rewards,
+        tranMatElementwise=tranMatElementwise)
+```
+
+**(2) Probabilities and column (to_state) indices in separate lists:**
+
+```python
+tranMatProbs = [[[0.9,0.1],[0.1,0.9]],
+                [[0.4,0.5,0.1],[0.3,0.5,0.2]],
+                [[0.2,0.2,0.6],[0.5,0.5]]]
+
+tranMatColumns = [[[0,1],[0,1]],
+                [[0,1,2],[0,1,2]],
+                [[0,1,2],[0,1]]]
+
+mdl.mdp(discount=0.8,
+        rewards=rewards,
+        tranMatProbs=tranMatProbs,
+        tranMatColumns=tranMatColumns)
+
+```
+
+**(3) Load the elementwise representation from a file:**
+
+```python
+mdl.mdp(discount=0.8,
+        rewards=rewards,
+        tranMatFromFile="transitions.csv")
+```
+
+# User manual
+
+Further information can be found in the wiki for `mdpsolver` on Github.
+
+# How to cite
+
 [![DOI](https://zenodo.org/badge/294063917.svg)](https://zenodo.org/badge/latestdoi/294063917)

{mdpsolver-0.9.1 → mdpsolver-0.9.2}/pyproject.toml

@@ -10,7 +10,7 @@ where = ["src"]
 
 [project]
 name = "mdpsolver"
-version = "0.9.1"
+version = "0.9.2"
 authors = [
   { name="Anders Reenberg Andersen", email="andersra@live.dk" },
   { name="Jesper Fink Andersen", email="jfan@dtu.dk" },

{mdpsolver-0.9.1 → mdpsolver-0.9.2}/src/mdpsolver/model.py

@@ -9,7 +9,7 @@ class model:
     def __init__(self):
         self.initialize()            
         
-    def initialize(self):
+    def initialize(self):        
         #create the solver object
         self.mdl = solvermodule.Model()
     

{mdpsolver-0.9.1 → mdpsolver-0.9.2/src/mdpsolver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdpsolver
-Version: 0.9.1
+Version: 0.9.2
 Summary: An efficient solver for Markov Decision Processes
 Author-email: Anders Reenberg Andersen <andersra@live.dk>, Jesper Fink Andersen <jfan@dtu.dk>
 Project-URL: Homepage, https://github.com/areenberg/MDPSolver
@@ -22,7 +22,7 @@ License-File: LICENSE
 * Available on PyPI.
 * Solver-engine developed in C++.
 * Available optimization algorithms: *Value iteration*, *Policy iteration*, and *Modified policy iteration*.  
-* Includes a variety of input formats available for users to choose from.
+* Includes support for sparse matrices.
 
 # Quick start guide
 
@@ -82,7 +82,7 @@ print(mdl.getPolicy())
 #[1, 1, 0]
 ```
 
-## Large transition matrix?
+## Sparse transition matrix?
 
 `mdpsolver` has three alternative formats for large and highly sparse transition probability matrices.
 

{mdpsolver-0.9.1 → mdpsolver-0.9.2}/src/mdpsolver.egg-info/SOURCES.txt

@@ -5,6 +5,8 @@ pyproject.toml
 src/mdpsolver/__init__.py
 src/mdpsolver/model.py
 src/mdpsolver/solvermodule.cp310-win_amd64.pyd
+src/mdpsolver/solvermodule.cp311-win_amd64.pyd
+src/mdpsolver/solvermodule.cp312-win_amd64.pyd
 src/mdpsolver/solvermodule.cpython-310-x86_64-linux-gnu.so
 src/mdpsolver.egg-info/PKG-INFO
 src/mdpsolver.egg-info/SOURCES.txt