initial support for partitions in translation from gspn to jani

src/storm-gspn/builder/JaniGSPNBuilder.h

@@ -81,14 +81,28 @@ namespace storm {
                     
                 }
                 if(!ignoreWeights) {
-                
+                    uint64_t lastPriority;
+                    storm::expressions::Expression lastPriorityGuard = expressionManager->boolean(false);
+                    storm::expressions::Expression priorityGuard = expressionManager->boolean(true);
                     // TODO here there is something to fix if we add transition partitions.
+                    
+                    for (auto const& partition : gspn.getPartitions()) {
                         storm::expressions::Expression guard = expressionManager->boolean(false);
                         std::vector<storm::jani::EdgeDestination> weightedDestinations;
                         
+                        
+                        assert(lastPriority <= partition.priority);
+                        if (lastPriority < partition.priority) {
+                            priorityGuard = priorityGuard && !lastPriorityGuard;
+                            lastPriority = partition.priority;
+                        } else {
+                            assert(lastPriority == partition.priority);
+                        }
+                        
                         // Compute enabled weight expression.
                         storm::expressions::Expression totalWeight = expressionManager->rational(0.0);
-                    for (auto const& trans : gspn.getImmediateTransitions()) {
+                        for (auto const& transId : partition.transitions) {
+                            auto const& trans = gspn.getImmediateTransitions()[transId];
                             if (trans.noWeightAttached()) {
                                 continue;
                             }
@@ -104,7 +118,9 @@ namespace storm {
                         }
                         totalWeight = totalWeight.simplify();
                         
-                    for (auto const& trans : gspn.getImmediateTransitions()) {
+                        
+                        for (auto const& transId : partition.transitions) {
+                            auto const& trans = gspn.getImmediateTransitions()[transId];
                             if (trans.noWeightAttached()) {
                                 continue;
                             }
@@ -126,8 +142,13 @@ namespace storm {
                             storm::jani::EdgeDestination dest(locId, storm::expressions::ite(destguard, (expressionManager->rational(trans.getWeight()) / totalWeight), expressionManager->rational(0.0)), oa);
                             weightedDestinations.push_back(dest);
                         }
-                    storm::jani::Edge e(locId, storm::jani::Model::SILENT_ACTION_INDEX, boost::none, guard.simplify(), weightedDestinations);
+                        storm::jani::Edge e(locId, storm::jani::Model::SILENT_ACTION_INDEX, boost::none, (priorityGuard && guard).simplify(), weightedDestinations);
                         automaton.addEdge(e);
+                        lastPriorityGuard = lastPriorityGuard || guard;
+                    }
+                    
+                    
+                    
                 }
                 for (auto const& trans : gspn.getTimedTransitions()) {
                     storm::expressions::Expression guard = expressionManager->boolean(true);

src/storm-gspn/storage/gspn/GSPN.cpp

@@ -57,6 +57,10 @@ namespace storm {
             return m;
         }
 
+        std::vector<TransitionPartition> const&  GSPN::getPartitions() const {
+            return partitions;
+        }
+        
         
         storm::gspn::Place const* GSPN::getPlace(uint64_t id) const {
             if(id < places.size()) {

src/storm-gspn/storage/gspn/GSPN.h

@@ -38,6 +38,11 @@ namespace storm {
              */
             uint64_t getNumberOfPlaces() const;
 
+            /*!
+             *  
+             */
+            std::vector<TransitionPartition> const& getPartitions() const;
+            
             /*!
              * Returns the vector of timed transitions in this gspn.
              *
@@ -65,7 +70,6 @@ namespace storm {
              */
             std::shared_ptr<storm::gspn::Marking> getInitialMarking(std::map<uint64_t, uint64_t>& numberOfBits, uint64_t const& numberOfTotalBits) const;
 
-            
             /*!
              * Returns the place with the corresponding id.
              *
@@ -86,6 +90,7 @@ namespace storm {
              * Returns the timed transition with the corresponding name.
              *
              * @param name The ID of the timed transition.
+             * @return A pointer to the transition, and nullptr otherwise
              */
             storm::gspn::TimedTransition<GSPN::RateType> const* getTimedTransition(std::string const& name) const;
 

src/storm-gspn/storage/gspn/GspnBuilder.cpp

@@ -162,6 +162,7 @@ namespace storm {
                 }
                 
             }
+            std::reverse(orderedPartitions.begin(), orderedPartitions.end());
             
             return new GSPN(gspnName, places, immediateTransitions, timedTransitions, orderedPartitions);
         }