Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit engine Markov chain actions and transition rewards #247

Merged
merged 13 commits into from
Aug 8, 2024
Merged

Explicit engine Markov chain actions and transition rewards #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
45e51c1
Comment typo.
davexparker Jul 12, 2024
5bded3a
Refactor DTMCSimple to not use Distribution.
davexparker Jul 3, 2024
9de7f24
Add action storage/export to DTMCs/CTMCs in explicit engine.
davexparker Jul 3, 2024
307b298
New explicit engine data structures ListSimple, ListNestedSimple.
davexparker Jul 12, 2024
9a035bc
Use ListSimple/ListNestedSimple in reward classes.
davexparker Jul 12, 2024
4f6b18c
Add support for Markov chain transition rewards in explicit engine.
davexparker Jul 4, 2024
2412733
Reward storage refactoring/simplification in explicit engine.
davexparker Jul 14, 2024
b6c708e
Update Exporters to use Rewards, not MCRewards/MDPRewards.
davexparker Jul 15, 2024
4815afb
Simplify/expand export regression tests.
davexparker Jul 15, 2024
6701009
IDTMC export regression tests.
davexparker Jul 15, 2024
cbece80
RewardsSimple fix (make sure zero gets set with evaluator).
davexparker Jul 15, 2024
f1644a4
RewardsSimple toString fixes.
davexparker Jul 15, 2024
1de42fa
RewardsSimple bugfix: error in (unused) constructor with map.
davexparker Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prism-tests/bugfixes/export-precision/rare.pm.importexport.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Reduce precision for some tests due to minor differences between the engines

-exportmodelprecision 16 -exportmodel rare.pm.tra
-exportmodelprecision 16 -exportmodel rare.pm.tra:actions=false
-exportmodelprecision 16 -exportmodel rare.pm.srew -noexportheaders

25 changes: 12 additions & 13 deletions prism-tests/functionality/export/ctmc/cluster.sm.exportmodel.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@

# Export all model info in different formats

-exportmodelprecision 16 -exportmodel cluster.sm.all -noexportheaders
-exportmodelprecision 16 -exportmodel cluster.sm.matlab.all:matlab
-exportmodelprecision 16 -exportmodel cluster.sm.rows.all:rows -noexportheaders
-exportmodel cluster.sm.all
-exportmodel cluster.sm.matlab.all:matlab
-exportmodel cluster.sm.rows.all:rows

# Export model info separately (for a few formats)

-exportmodelprecision 16 -exportmodel cluster.sm.tra
-exportmodel cluster.sm.tra
-exportmodel cluster.sm.lab
-exportmodel cluster.sm.sta
-exportmodel cluster.sm.srew -noexportheaders
-exportmodel cluster.sm.trew -noexportheaders
-exportmodel cluster.sm.srew
-exportmodel cluster.sm.trew

# Export model info separately (for a few formats) - explicit
# Export model info - explicit engine

-exportmodel cluster.sm.tra -ex
-exportmodel cluster.sm.all:actions=false -ex

-exportmodel cluster.sm.tra:actions=false -ex
-exportmodel cluster.sm.sta -ex
-exportmodel cluster.sm.lab -ex
#-exportmodel cluster.sm.srew -ex
#-exportmodel cluster.sm.trew -ex
#-exportmodel cluster.sm.matlab.tra:matlab -ex
#-exportmodel cluster.sm.matlab.sta:matlab -ex
-exportmodel cluster.sm.matlab.lab:matlab -ex
-exportmodel cluster.sm.srew -ex
-exportmodel cluster.sm.trew -ex
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm.rows1.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Reward structure "percent_op"
# State rewards
276 240
28 25
29 25
Expand Down
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm.rows2.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Reward structure "time_not_min"
# State rewards
276 144
0 1
1 1
Expand Down
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm.rows3.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# Reward structure "num_repairs"
# State rewards
276 0
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm1.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Reward structure "percent_op"
# State rewards
276 240
28 25
29 25
Expand Down
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm1.trew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# Reward structure "percent_op"
# Transition rewards
276 0
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm2.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Reward structure "time_not_min"
# State rewards
276 144
0 1
1 1
Expand Down
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm2.trew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# Reward structure "time_not_min"
# Transition rewards
276 0
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm3.srew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# Reward structure "num_repairs"
# State rewards
276 0
2 changes: 2 additions & 0 deletions prism-tests/functionality/export/ctmc/cluster.sm3.trew
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Reward structure "num_repairs"
# Transition rewards
276 204
8 1 1
9 3 1
Expand Down
Loading
Loading