From d875f8ba0de6a3c0655f94f50db49aaaa123235b Mon Sep 17 00:00:00 2001 From: TimQu Date: Tue, 25 Sep 2018 15:14:39 +0200 Subject: [PATCH] lowest/highest assignment level of an edge now only consider the edge destinations --- src/storm/storage/jani/Edge.h | 4 ++-- src/storm/storage/jani/TemplateEdge.cpp | 9 ++------- src/storm/storage/jani/TemplateEdge.h | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/storm/storage/jani/Edge.h b/src/storm/storage/jani/Edge.h index 36abaa5f3..099f5ca14 100644 --- a/src/storm/storage/jani/Edge.h +++ b/src/storm/storage/jani/Edge.h @@ -121,13 +121,13 @@ namespace storm { void setTemplateEdge(std::shared_ptr const& newTe); /*! - * Retrieves the lowest assignment level occurring in each assignment. + * Retrieves the lowest assignment level occurring in a destination assignment. * If no assignment exists, this value is the highest possible integer */ int64_t const& getLowestAssignmentLevel() const; /*! - * Retrieves the highest assignment level occurring in each assignment + * Retrieves the highest assignment level occurring in a destination assignment * If no assignment exists, this value is always zero */ int64_t const& getHighestAssignmentLevel() const; diff --git a/src/storm/storage/jani/TemplateEdge.cpp b/src/storm/storage/jani/TemplateEdge.cpp index 51fee6578..50f5b4d8b 100644 --- a/src/storm/storage/jani/TemplateEdge.cpp +++ b/src/storm/storage/jani/TemplateEdge.cpp @@ -27,13 +27,8 @@ namespace storm { } void TemplateEdge::finalize(Model const& containingModel) { - if (assignments.empty()) { - lowestAssignmentLevel = std::numeric_limits::max(); - highestAssignmentLevel = std::numeric_limits::min(); - } else { - lowestAssignmentLevel = assignments.getLowestLevel(); - highestAssignmentLevel = assignments.getHighestLevel(); - } + lowestAssignmentLevel = std::numeric_limits::max(); + highestAssignmentLevel = std::numeric_limits::min(); for (auto const& destination : getDestinations()) { if (!destination.getOrderedAssignments().empty()) { lowestAssignmentLevel = std::min(lowestAssignmentLevel, destination.getOrderedAssignments().getLowestLevel()); diff --git a/src/storm/storage/jani/TemplateEdge.h b/src/storm/storage/jani/TemplateEdge.h index 1606bec85..9e8c0e761 100644 --- a/src/storm/storage/jani/TemplateEdge.h +++ b/src/storm/storage/jani/TemplateEdge.h @@ -92,13 +92,13 @@ namespace storm { bool usesAssignmentLevels(bool onlyTransient = false) const; /*! - * Retrieves the lowest assignment level occurring in each assignment. + * Retrieves the lowest assignment level occurring in a destination assignment. * If no assignment exists, this value is the highest possible integer */ int64_t const& getLowestAssignmentLevel() const; /*! - * Retrieves the highest assignment level occurring in each assignment + * Retrieves the highest assignment level occurring in a destination assignment * If no assignment exists, this value is always zero */ int64_t const& getHighestAssignmentLevel() const;