sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

debugging and output of results for deterministic pareto explorer

main
TimQu 7 years ago
parent
571e157eef
commit
ac1d5df5c4
3 changed files with 97 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicParetoExplorer.cpp
  2. 13
      src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicParetoExplorer.h
  3. 4
      src/storm/storage/geometry/coordinates.h

101
src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicParetoExplorer.cpp
View File

@ -7,6 +7,8 @@
#include "storm/models/sparse/MarkovAutomaton.h" #include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/Mdp.h" #include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/StandardRewardModel.h" #include "storm/models/sparse/StandardRewardModel.h"
#include "storm/modelchecker/multiobjective/MultiObjectivePostprocessing.h"
#include "storm/modelchecker/results/ExplicitParetoCurveCheckResult.h"
#include "storm/environment/modelchecker/MultiObjectiveModelCheckerEnvironment.h" #include "storm/environment/modelchecker/MultiObjectiveModelCheckerEnvironment.h"
#include "storm/utility/export.h" #include "storm/utility/export.h"
@ -101,7 +103,7 @@ namespace storm {
out << ", "; out << ", ";
} }
if (convertToDouble) { if (convertToDouble) {
out << pi;
out << storm::utility::convertNumber<double>(pi);
} else { } else {
out << pi; out << pi;
} }
@ -128,7 +130,7 @@ namespace storm {
} }
template <class SparseModelType, typename GeometryValueType> template <class SparseModelType, typename GeometryValueType>
boost::optional<typename DeterministicParetoExplorer<SparseModelType, GeometryValueType>::PointId> DeterministicParetoExplorer<SparseModelType, GeometryValueType>::Pointset::addPoint(Point&& point) {
boost::optional<typename DeterministicParetoExplorer<SparseModelType, GeometryValueType>::PointId> DeterministicParetoExplorer<SparseModelType, GeometryValueType>::Pointset::addPoint(Environment const& env, Point&& point) {
// Find dominated and dominating points // Find dominated and dominating points
auto pointsIt = points.begin(); auto pointsIt = points.begin();
@ -138,13 +140,15 @@ namespace storm {
case Point::DominanceResult::Incomparable: case Point::DominanceResult::Incomparable:
// Nothing to be done for this point // Nothing to be done for this point
++pointsIt; ++pointsIt;
break;
case Point::DominanceResult::Dominates: case Point::DominanceResult::Dominates:
// Found a point in the set that is dominated by the new point, so we erase it // Found a point in the set that is dominated by the new point, so we erase it
if (pointsIt->second.isParetoOptimal()) { if (pointsIt->second.isParetoOptimal()) {
STORM_LOG_WARN("Potential precision issues: Found a point that dominates another point which was flagged as pareto optimal. Distance of points is " << storm::storage::geometry::euclideanDistance(pointsIt->second.get(), point.get()));
STORM_LOG_WARN("Potential precision issues: Found a point that dominates another point which was flagged as pareto optimal. Distance of points is " << std::sqrt(storm::utility::convertNumber<double>(storm::storage::geometry::squaredEuclideanDistance(pointsIt->second.get(), point.get()))));
point.setParetoOptimal(true); point.setParetoOptimal(true);
} }
pointsIt = points.erase(pointsIt); pointsIt = points.erase(pointsIt);
break;
case Point::DominanceResult::Dominated: case Point::DominanceResult::Dominated:
// The new point is dominated by another point. // The new point is dominated by another point.
return boost::none; return boost::none;
@ -156,6 +160,10 @@ namespace storm {
} }
} }
if (env.modelchecker().multi().isPrintResultsSet()) {
std::cout << "## achievable point: [" << point.toString(true) << "]" << std::endl;
}
points.emplace_hint(points.end(), currId, std::move(point)); points.emplace_hint(points.end(), currId, std::move(point));
return currId++; return currId++;
} }
@ -276,6 +284,7 @@ namespace storm {
template <class SparseModelType, typename GeometryValueType> template <class SparseModelType, typename GeometryValueType>
DeterministicParetoExplorer<SparseModelType, GeometryValueType>::DeterministicParetoExplorer(preprocessing::SparseMultiObjectivePreprocessorResult<SparseModelType>& preprocessorResult) : model(preprocessorResult.preprocessedModel), objectives(preprocessorResult.objectives) { DeterministicParetoExplorer<SparseModelType, GeometryValueType>::DeterministicParetoExplorer(preprocessing::SparseMultiObjectivePreprocessorResult<SparseModelType>& preprocessorResult) : model(preprocessorResult.preprocessedModel), objectives(preprocessorResult.objectives) {
originalModelInitialState = *preprocessorResult.originalModel.getInitialStates().begin();
schedulerEvaluator = std::make_shared<MultiObjectiveSchedulerEvaluator<SparseModelType>>(preprocessorResult); schedulerEvaluator = std::make_shared<MultiObjectiveSchedulerEvaluator<SparseModelType>>(preprocessorResult);
weightVectorChecker = std::make_shared<DetSchedsWeightVectorChecker<SparseModelType>>(schedulerEvaluator); weightVectorChecker = std::make_shared<DetSchedsWeightVectorChecker<SparseModelType>>(schedulerEvaluator);
} }
@ -290,9 +299,14 @@ namespace storm {
unprocessedFacets.pop(); unprocessedFacets.pop();
processFacet(env, f); processFacet(env, f);
} }
// Todo: Prepare check result
return nullptr;
std::vector<std::vector<ModelValueType>>paretoPoints;
paretoPoints.reserve(pointset.size());
for (auto const& p : pointset) {
paretoPoints.push_back(storm::utility::vector::convertNumericVector<ModelValueType>(transformObjectiveValuesToOriginal(objectives, p.second.get())));
}
return std::make_unique<storm::modelchecker::ExplicitParetoCurveCheckResult<ModelValueType>>(originalModelInitialState, std::move(paretoPoints),
nullptr, nullptr);
} }
template <class SparseModelType, typename GeometryValueType> template <class SparseModelType, typename GeometryValueType>
@ -303,6 +317,60 @@ namespace storm {
unachievableAreas.clear(); unachievableAreas.clear();
} }
template <class SparseModelType, typename GeometryValueType>
void DeterministicParetoExplorer<SparseModelType, GeometryValueType>::addHalfspaceToOverApproximation(Environment const& env, std::vector<GeometryValueType> const& normalVector, Point const& pointOnHalfspace) {
GeometryValueType offset = storm::utility::vector::dotProduct(normalVector, pointOnHalfspace.get());
if (env.modelchecker().multi().isPrintResultsSet()) {
std::cout << "## unachievable halfspace: [";
bool first = true;
for (auto const& xi : normalVector) {
if (first) {
first = false;
} else {
std::cout << ",";
}
std::cout << storm::utility::convertNumber<double>(xi);
}
std::cout << "];[" << storm::utility::convertNumber<double>(offset) << "]" << std::endl;
}
storm::storage::geometry::Halfspace<GeometryValueType> overApproxHalfspace(normalVector, offset);
overApproximation = overApproximation->intersection(overApproxHalfspace);
}
template <class SparseModelType, typename GeometryValueType>
void DeterministicParetoExplorer<SparseModelType, GeometryValueType>::addUnachievableArea(Environment const& env, Polytope const& area) {
if (env.modelchecker().multi().isPrintResultsSet()) {
std::vector<std::vector<GeometryValueType>> vertices;
if (objectives.size() == 2) {
vertices = area->getVerticesInClockwiseOrder();
} else {
vertices = area->getVertices();
}
std::cout << "## unachievable polytope: ";
bool firstVertex = true;
for (auto const& v : vertices) {
if (firstVertex) {
firstVertex = false;
} else {
std::cout << ";";
}
std::cout << "[";
bool firstEntry = true;
for (auto const& vi : v) {
if (firstEntry) {
firstEntry = false;
} else {
std::cout << ",";
}
std::cout << storm::utility::convertNumber<double>(vi);
}
std::cout << "]";
}
std::cout << std::endl;
}
unachievableAreas.push_back(area);
}
template <class SparseModelType, typename GeometryValueType> template <class SparseModelType, typename GeometryValueType>
void DeterministicParetoExplorer<SparseModelType, GeometryValueType>::initializeFacets(Environment const& env) { void DeterministicParetoExplorer<SparseModelType, GeometryValueType>::initializeFacets(Environment const& env) {
for (uint64_t objIndex = 0; objIndex < objectives.size(); ++objIndex) { for (uint64_t objIndex = 0; objIndex < objectives.size(); ++objIndex) {
@ -327,11 +395,9 @@ namespace storm {
// Adapt the overapproximation // Adapt the overapproximation
std::vector<GeometryValueType> normalVector(objectives.size(), storm::utility::zero<GeometryValueType>()); std::vector<GeometryValueType> normalVector(objectives.size(), storm::utility::zero<GeometryValueType>());
normalVector[objIndex] = storm::utility::one<GeometryValueType>(); normalVector[objIndex] = storm::utility::one<GeometryValueType>();
GeometryValueType offset = storm::utility::vector::dotProduct(normalVector, p.get());
storm::storage::geometry::Halfspace<GeometryValueType> overApproxHalfspace(std::move(normalVector), std::move(offset));
overApproximation = overApproximation->intersection(overApproxHalfspace);
addHalfspaceToOverApproximation(env, normalVector, p);
} }
pointset.addPoint(std::move(p));
pointset.addPoint(env, std::move(p));
} }
} }
@ -390,7 +456,7 @@ namespace storm {
} }
// Reaching this point means that the facet could not be analyzed completely. // Reaching this point means that the facet could not be analyzed completely.
STORM_LOG_ERROR("Facet " << f.getHalfspace().toString(true) << "could not be analyzed completely.");
STORM_LOG_ERROR("Facet " << f.getHalfspace().toString(true) << " could not be analyzed completely.");
} }
template <class SparseModelType, typename GeometryValueType> template <class SparseModelType, typename GeometryValueType>
@ -417,13 +483,10 @@ namespace storm {
if (last) { if (last) {
last = false; last = false;
p.setParetoOptimal(true); p.setParetoOptimal(true);
// Adapt the overapproximation
GeometryValueType offset = storm::utility::vector::dotProduct(f.getHalfspace().normalVector(), p.get());
storm::storage::geometry::Halfspace<GeometryValueType> overApproxHalfspace(f.getHalfspace().normalVector(), std::move(offset));
overApproximation = overApproximation->intersection(overApproxHalfspace);
optPointId = pointset.addPoint(std::move(p));
addHalfspaceToOverApproximation(env, f.getHalfspace().normalVector(), p);
optPointId = pointset.addPoint(env, std::move(p));
} else { } else {
pointset.addPoint(std::move(p));
pointset.addPoint(env, std::move(p));
} }
} }
@ -456,7 +519,9 @@ namespace storm {
++vertexIt; ++vertexIt;
} }
assert(vertexIt == vertices.end()); assert(vertexIt == vertices.end());
unprocessedFacets.push(std::move(fNew));
if (!checkFacetPrecision(env, fNew)) {
unprocessedFacets.push(std::move(fNew));
}
} }
} }
return true; return true;

13
src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicParetoExplorer.h
View File

@ -68,7 +68,7 @@ namespace storm {
* Erases all points in the set, that are dominated by the given point. * Erases all points in the set, that are dominated by the given point.
* If the same point is already contained in the set, its id is returned * If the same point is already contained in the set, its id is returned
*/ */
boost::optional<PointId> addPoint(Point&& point);
boost::optional<PointId> addPoint(Environment const& env, Point&& point);
/*! /*!
* Returns the point with the given ID * Returns the point with the given ID
@ -135,6 +135,16 @@ namespace storm {
*/ */
void clean(); void clean();
/*!
* Intersects the overapproximation with the given halfspace
*/
void addHalfspaceToOverApproximation(Environment const& env, std::vector<GeometryValueType> const& normalVector, Point const& pointOnHalfspace);
/*!
* Adds a polytope which consists of unachievable point
*/
void addUnachievableArea(Environment const& env, Polytope const& area);
/*! /*!
* Builds the initial facets by optimizing the objectives individually. * Builds the initial facets by optimizing the objectives individually.
* Adds the facets that need further processing to unprocessedFacets * Adds the facets that need further processing to unprocessedFacets
@ -194,6 +204,7 @@ namespace storm {
std::shared_ptr<MultiObjectiveSchedulerEvaluator<SparseModelType>> schedulerEvaluator; std::shared_ptr<MultiObjectiveSchedulerEvaluator<SparseModelType>> schedulerEvaluator;
std::shared_ptr<DetSchedsWeightVectorChecker<SparseModelType>> weightVectorChecker; std::shared_ptr<DetSchedsWeightVectorChecker<SparseModelType>> weightVectorChecker;
std::shared_ptr<SparseModelType> const& model; std::shared_ptr<SparseModelType> const& model;
uint64_t originalModelInitialState;
std::vector<Objective<ModelValueType>> const& objectives; std::vector<Objective<ModelValueType>> const& objectives;
}; };

4
src/storm/storage/geometry/coordinates.h
View File

@ -6,7 +6,7 @@ namespace storm {
namespace geometry { namespace geometry {
template <typename T> template <typename T>
T euclideanDistance(std::vector<T> const& p, std::vector<T> const& q) {
T squaredEuclideanDistance(std::vector<T> const& p, std::vector<T> const& q) {
STORM_LOG_ASSERT(p.size() == q.size(), "Invalid dimensions of input vectors."); STORM_LOG_ASSERT(p.size() == q.size(), "Invalid dimensions of input vectors.");
T squaredSum = storm::utility::zero<T>(); T squaredSum = storm::utility::zero<T>();
auto pIt = p.begin(); auto pIt = p.begin();
@ -16,7 +16,7 @@ namespace storm {
T diff = *pIt - *qIt; T diff = *pIt - *qIt;
squaredSum += diff * diff; squaredSum += diff * diff;
} }
return storm::utility::sqrt(squaredSum);
return squaredSum;
} }
} }

Write Preview
Loading…
Cancel
Save