(LTL) FragmentSpecification: add pctlstar() and prctlstar() fragments

We add the star variants (allow complex path formulas).

 Conflicts:
	src/storm/logic/FragmentSpecification.cpp
	src/storm/logic/FragmentSpecification.h

src/storm/logic/FragmentSpecification.cpp

@@ -45,6 +45,17 @@ namespace storm {
             return pctl;
         }
 
+        FragmentSpecification pctlstar() {
+            FragmentSpecification pctlstar = pctl();
+
+            pctlstar.setBinaryBooleanPathFormulasAllowed(true);
+            pctlstar.setUnaryBooleanPathFormulasAllowed(true);
+            pctlstar.setNestedOperatorsAllowed(true);
+            pctlstar.setNestedPathFormulasAllowed(true);
+
+            return pctlstar;
+        }
+
         FragmentSpecification flatPctl() {
             FragmentSpecification flatPctl = pctl();
 
@@ -53,6 +64,35 @@ namespace storm {
             return flatPctl;
         }
 
+        FragmentSpecification prctl() {
+            FragmentSpecification prctl = pctl();
+
+            prctl.setRewardOperatorsAllowed(true);
+            prctl.setCumulativeRewardFormulasAllowed(true);
+            prctl.setInstantaneousFormulasAllowed(true);
+            prctl.setReachabilityRewardFormulasAllowed(true);
+            prctl.setLongRunAverageOperatorsAllowed(true);
+            prctl.setStepBoundedCumulativeRewardFormulasAllowed(true);
+            prctl.setTimeBoundedCumulativeRewardFormulasAllowed(true);
+
+            return prctl;
+        }
+
+        FragmentSpecification prctlstar() {
+            FragmentSpecification prctlstar = pctlstar();
+
+            prctlstar.setRewardOperatorsAllowed(true);
+            prctlstar.setCumulativeRewardFormulasAllowed(true);
+            prctlstar.setInstantaneousFormulasAllowed(true);
+            prctlstar.setReachabilityRewardFormulasAllowed(true);
+            prctlstar.setLongRunAverageOperatorsAllowed(true);
+            prctlstar.setStepBoundedCumulativeRewardFormulasAllowed(true);
+            prctlstar.setTimeBoundedCumulativeRewardFormulasAllowed(true);
+
+            return prctlstar;
+
+        }
+
         FragmentSpecification rpatl() {
             FragmentSpecification rpatl = propositional();
 
@@ -73,20 +113,6 @@ namespace storm {
             return rpatl;
         }
 
-        FragmentSpecification prctl() {
-            FragmentSpecification prctl = pctl();
-
-            prctl.setRewardOperatorsAllowed(true);
-            prctl.setCumulativeRewardFormulasAllowed(true);
-            prctl.setInstantaneousFormulasAllowed(true);
-            prctl.setReachabilityRewardFormulasAllowed(true);
-            prctl.setLongRunAverageOperatorsAllowed(true);
-            prctl.setStepBoundedCumulativeRewardFormulasAllowed(true);
-            prctl.setTimeBoundedCumulativeRewardFormulasAllowed(true);
-
-            return prctl;
-        }
-
         FragmentSpecification csl() {
             FragmentSpecification csl = pctl();
 

src/storm/logic/FragmentSpecification.h

@@ -249,12 +249,18 @@ namespace storm {
         // Flat PCTL.
         FragmentSpecification flatPctl();
 
-        // rPATL for SMGs
-        FragmentSpecification rpatl();
+        // PCTL*
+        FragmentSpecification pctlstar();
 
         // PCTL + cumulative, instantaneous, reachability and long-run rewards.
         FragmentSpecification prctl();
 
+        // PCTL* + cumulative, instantaneous, reachability and long-run rewards.
+        FragmentSpecification prctlstar();
+
+        // rPATL for SMGs
+        FragmentSpecification rpatl();
+
         // Regular CSL.
         FragmentSpecification csl();