f390aeadf3
rm broken Dijkstra from graph.cpp
8 years ago
b71ef02692
comments and fixes (?) to graph.cpp's Dijkstra
This implementation seemed pretty wrong in multiple ways;
I attempted to fix it (a long time ago) (see diff, you'll see what I'm
talking about), then gave up.
Luckily (?) the code is unused, just sitting there, sad and broken.
8 years ago
07fc8e32ec
merge k-shortest Paths
8 years ago
87e8af9852
moved ksp stuff to right location
fix include
8 years ago
9bb65389c4
some adjustments to pgcl treatment caused by changes in JANI data structures
8 years ago
7d06eee4ea
adjusted KSP test model path
8 years ago
6ec05a942d
rm accidentally reintroduced files (don't worry they are small)
8 years ago
79f3e13906
change KSP test reference values to whatever they currently are
(and hoping for the best)
8 years ago
3915a491cf
factor out test state
8 years ago
71a54a842c
comment / clarification
8 years ago
daa76f7eb4
kSP: accept matrix-vector input; various other stuff
8 years ago
0c6574c740
rm questionable assertion
8 years ago
83445f67c3
kSP: a few more comments
8 years ago
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
4bc9266416
redundant namespace refs rm
9 years ago
67ce5cf18d
const& in signatures
8 years ago
b58d48f92d
use probs from targetProbMap TODO: test
9 years ago
5f66374481
vector to map conversion
9 years ago
51c44bb786
matrix/vector ctor, targetProbMap, TODO: non-1 entries
9 years ago
44b3a9108e
switching from vector<state_t> to BV as authoritative input
# Conflicts:
# src/utility/shortestPaths.h
9 years ago
55599b51e7
aliased BitVector, used state_t more (cosmetic)
9 years ago
235671d67d
use map rather than set for target[Prob]
9 years ago
68ac0b24ec
instantiate template for shortest path generation
Former-commit-id: e5f505b8d47146af99e324e3f3d92a
9 years ago
e883c60519
rm model as member; extracting all needed stuff in ctor
# Conflicts:
# src/utility/shortestPaths.cpp
9 years ago
cf1fa2bfc9
the plan
9 years ago
80382da033
adapt KSP test cases to new API; still fail
Former-commit-id: 984f4f9b695de4e31bc8c41eea12e8
8 years ago
5d28c4cb57
naive performance test on crowds5-4 (cf Comics)
Former-commit-id: c1616d07fde2068f5e84158cf0a245
9 years ago
fbee00e448
KSP output as BitVector or list
Former-commit-id: f8a74864f73b61d8d4764fe402ae83
9 years ago
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: f395c3df407fa07d1c8ff50dd3ce7c
9 years ago
62fcf7e0a5
thoughts about loops & target groups
Former-commit-id: c9b4b3697d8609d79a43dea158308b
9 years ago
d8f2eec9af
actual test for single-target non-disjoint KSP
Former-commit-id: abb27b90788492e75c07c60c829826
9 years ago
140597fb90
interactive debug in test
Former-commit-id: 161afac16e17962bf20053dc4819cf
9 years ago
df195d85f6
REA fully implemented; needs testing
Former-commit-id: 9795a24835fc732962dd0ae2abacd1
9 years ago
38d22093a3
documentation / cleanup
Former-commit-id: e7798a566943dd865fbc6fb69a017c
9 years ago
d6c6b9b8d5
path printing
print path ammendment: off-by-one
Former-commit-id: cdeb58711babd5a8777f506ce7fc90
9 years ago
519b46f171
path construction
thanks to new Dijkstra, the (1-)shortest paths construction code is
simpler
Former-commit-id: ec2ef461b85757d66bc500f3d35a38
9 years ago
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: 33b2be80670d5c507568b35fc0bee3
9 years ago
010f0ca988
shortest paths generator skeleton
Former-commit-id: c37fdbbec823dba537c76eb54e64ad
9 years ago
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: 06f9a28306e7e2385e0d3505011831
9 years ago
2aec312fbd
testcase-stub for kshortest added
Former-commit-id: 215c5b73785598231acb6d51229aa1
9 years ago
4feb332d55
Fixed include file
8 years ago
6d49f8cc60
Fixed include path for storm-config.h
8 years ago
7850eb0f3b
Merge branch 'mergeMenuGamesWithRationalFunction' into menu_games
8 years ago
1ce5068694
fixed include dir in sylvan
8 years ago
822ae6be40
Fixes
8 years ago
4acb4fefdc
Merge remote-tracking branch 'origin' into menu_games
8 years ago
bf29488219
fix for decomposition
8 years ago
fa204dc584
gspn working again
8 years ago
df87d7fa13
cleaned cmake list (removal of python related stuff), slightly altered doc (mainly just to improve further work on that
8 years ago
b9e4d6f334
initial support for transient boolean variables in formulas of JANI models (game-based engine)
8 years ago
Tom Janson
dehnert
sjunges
PBerger
sjunges