Tom Janson
3915a491cf
factor out test state
8 years ago
Tom Janson
71a54a842c
comment / clarification
8 years ago
Tom Janson
daa76f7eb4
kSP: accept matrix-vector input; various other stuff
8 years ago
tomjanson
0c6574c740
rm questionable assertion
8 years ago
tomjanson
83445f67c3
kSP: a few more comments
8 years ago
tomjanson
fe6804e164
KSP: matrix format conversion & lots of type stuff
# Conflicts:
# src/python/storm-tom.cpp
# src/utility/shortestPaths.cpp
# src/utility/shortestPaths.h
# test/functional/utility/KSPTest.cpp
# test/functional/utility/PdtmcInstantiationTest.cpp
8 years ago
tomjanson
4bc9266416
redundant namespace refs rm
9 years ago
tomjanson
67ce5cf18d
const& in signatures
8 years ago
tomjanson
b58d48f92d
use probs from targetProbMap TODO: test
9 years ago
tomjanson
5f66374481
vector to map conversion
9 years ago
tomjanson
51c44bb786
matrix/vector ctor, targetProbMap, TODO: non-1 entries
9 years ago
tomjanson
44b3a9108e
switching from vector<state_t> to BV as authoritative input
# Conflicts:
# src/utility/shortestPaths.h
9 years ago
tomjanson
55599b51e7
aliased BitVector, used state_t more (cosmetic)
9 years ago
tomjanson
235671d67d
use map rather than set for target[Prob]
9 years ago
sjunges
68ac0b24ec
instantiate template for shortest path generation
Former-commit-id: e5f505b8d4
[formerly 7146af99e3
]
Former-commit-id: 24e3f3d92a
9 years ago
tomjanson
e883c60519
rm model as member; extracting all needed stuff in ctor
# Conflicts:
# src/utility/shortestPaths.cpp
9 years ago
tomjanson
cf1fa2bfc9
the plan
9 years ago
tomjanson
80382da033
adapt KSP test cases to new API; still fail
Former-commit-id: 984f4f9b69
[formerly 5de4e31bc8
]
Former-commit-id: c41eea12e8
8 years ago
tomjanson
5d28c4cb57
naive performance test on crowds5-4 (cf Comics)
Former-commit-id: c1616d07fd
[formerly e2068f5e84
]
Former-commit-id: 158cf0a245
9 years ago
tomjanson
fbee00e448
KSP output as BitVector or list
Former-commit-id: f8a74864f7
[formerly 3b61d8d476
]
Former-commit-id: 4fe402ae83
9 years ago
tomjanson
b89d3f289a
group targets & minimal paths
Note that this is a major, API-breaking change.
Also bunched into this commit:
- rename namespace `shortestPaths` to `ksp`
- omit unneeded namespace qualifiers
- move tests from `GraphTest` to `KSPTest` and wrote more
- path representation explanation in .md file
Former-commit-id: f395c3df40
[formerly 7fa07d1c8f
]
Former-commit-id: f50dd3ce7c
9 years ago
tomjanson
62fcf7e0a5
thoughts about loops & target groups
Former-commit-id: c9b4b3697d
[formerly 8609d79a43
]
Former-commit-id: dea158308b
9 years ago
tomjanson
d8f2eec9af
actual test for single-target non-disjoint KSP
Former-commit-id: abb27b9078
[formerly 8492e75c07
]
Former-commit-id: c60c829826
9 years ago
tomjanson
140597fb90
interactive debug in test
Former-commit-id: 161afac16e
[formerly 17962bf200
]
Former-commit-id: 53dc4819cf
9 years ago
tomjanson
df195d85f6
REA fully implemented; needs testing
Former-commit-id: 9795a24835
[formerly fc732962dd
]
Former-commit-id: 0ae2abacd1
9 years ago
tomjanson
38d22093a3
documentation / cleanup
Former-commit-id: e7798a5669
[formerly 43dd865fbc
]
Former-commit-id: 6fb69a017c
9 years ago
tomjanson
d6c6b9b8d5
path printing
print path ammendment: off-by-one
Former-commit-id: cdeb58711b
[formerly abd5a8777f
]
Former-commit-id: 506ce7fc90
9 years ago
tomjanson
519b46f171
path construction
thanks to new Dijkstra, the (1-)shortest paths construction code is
simpler
Former-commit-id: ec2ef461b8
[formerly 5757d66bc5
]
Former-commit-id: 00f3d35a38
9 years ago
tomjanson
fd3c59e86e
Dijkstra implementation
Originally, I tried to adapt the existing (but in various ways broken)
Dijkstra implementation in `storm::utility::graph::performDijkstra`,
but that proved to be more cumbersome (mostly because of the behaviour on
initial states) than simply rolling my own -- so that's what I
eventually did.
Former-commit-id: 33b2be8067
[formerly 0d5c507568
]
Former-commit-id: b35fc0bee3
9 years ago
tomjanson
010f0ca988
shortest paths generator skeleton
Former-commit-id: c37fdbbec8
[formerly 23dba537c7
]
Former-commit-id: 6eb54e64ad
9 years ago
Tom Janson
6d1608a147
Dijkstra fixed, maybe
TODO: check; improve
Things that aren't going well:
- On the example graph BRP-16-2, all nodes have distance 1. I that
possible??
- The initial states list themself as their own predecessor. That's
bad, because it's simply false (unless there is a self-loop).
Former-commit-id: 06f9a28306
[formerly e7e2385e0d
]
Former-commit-id: 3505011831
9 years ago
sjunges
2aec312fbd
testcase-stub for kshortest added
Former-commit-id: 215c5b7378
[formerly 5598231acb
]
Former-commit-id: 6d51229aa1
9 years ago
PBerger
4feb332d55
Fixed include file
8 years ago
Philipp Berger
6d49f8cc60
Fixed include path for storm-config.h
8 years ago
Philipp Berger
7850eb0f3b
Merge branch 'mergeMenuGamesWithRationalFunction' into menu_games
8 years ago
dehnert
1ce5068694
fixed include dir in sylvan
8 years ago
Philipp Berger
822ae6be40
Fixes
8 years ago
dehnert
4acb4fefdc
Merge remote-tracking branch 'origin' into menu_games
8 years ago
dehnert
bf29488219
fix for decomposition
8 years ago
sjunges
fa204dc584
gspn working again
8 years ago
sjunges
df87d7fa13
cleaned cmake list (removal of python related stuff), slightly altered doc (mainly just to improve further work on that
8 years ago
dehnert
b9e4d6f334
initial support for transient boolean variables in formulas of JANI models (game-based engine)
8 years ago
sjunges
e3c9fa103a
Merge branch 'dft_to_gspn'
8 years ago
dehnert
696a2e7ce1
preparing labels for JANI models (game-based abstraction)
8 years ago
sjunges
65fbe856e4
possibility to disable reward variable creation
8 years ago
dehnert
04d3a649bc
finalized location variable for JANI automata
8 years ago
dehnert
158ddc0533
equipped automata in JANI models with expression variable representing their location
8 years ago
Matthias Volk
d040e2db4b
Disable Debug compiler flags for PrismParser to lessen memory consumption during compilation
8 years ago
dehnert
954eadc546
improved detection for early result detection in game based engine
8 years ago
dehnert
3125ad4c89
more work on boolean transient variables in JANI menu game abstraction (labels)
8 years ago