Merge remote-tracking branch 'upstream/master'

README.md

@@ -1,23 +1,22 @@
-Storm 
+Storm
 ==============================
 
-For more instructions, check out the documentation found in [Getting Started](https://moves-rwth.github.io/storm/getting-started.html)
+For more instructions, check out the documentation found in [Getting Started](http://www.stormchecker.org/getting-started.html).
 
 
 Benchmarks
 ----------------------------
 
-Example input files for storm can be obtained from  
-https://github.com/moves-rwth/storm-examples.  
-Running make example-files automatically obtains these files.
+Example input files for Storm can be obtained from  
+https://github.com/moves-rwth/storm-examples.
 
-Further examples and benchmarks found in the following repositories:
+Further examples and benchmarks can be found in the following repositories:
 
 * **Prism files** (DTMC, MDP, CTMC):  
-http://www.prismmodelchecker.org/benchmarks/
+http://www.prismmodelchecker.org/benchmarks
 * **Jani files** (DTMC, MDP, CTMC, MA):  
-http://jani-spec.org/
-* **GSPN**s:   
+http://jani-spec.org
+* **GSPN**s:  
 (private, contact: sebastian.junges@cs.rwth-aachen.de)
 * **DFT**s:  
 https://github.com/moves-rwth/dft-examples
@@ -31,8 +30,8 @@ Storm has been developed at RWTH Aachen University.
 
 ###### Principal developers
 * Christian Dehnert
-* Joost-Pieter Katoen
 * Sebastian Junges
+* Joost-Pieter Katoen
 * Matthias Volk
 
 ###### Developers (lexicographical order)
@@ -40,7 +39,7 @@ Storm has been developed at RWTH Aachen University.
 * David Korzeniewski
 * Tim Quatmann
 
-###### Contributors (lexicographical order) 
+###### Contributors (lexicographical order)
 * Dimitri Bohlender
 * Harold Bruintjes
 * Michael Deutschen

src/storm-dft/storage/dft/OrderDFTElementsById.cpp

@@ -22,12 +22,12 @@ namespace storm {
 
 
         // Explicitly instantiate the class.
-        template class OrderElementsById<double>;
-        template class OrderElementsByRank<double>;
+        template struct OrderElementsById<double>;
+        template struct OrderElementsByRank<double>;
 
 #ifdef STORM_HAVE_CARL
-        template class OrderElementsById<RationalFunction>;
-        template class OrderElementsByRank<RationalFunction>;
+        template struct OrderElementsById<RationalFunction>;
+        template struct OrderElementsByRank<RationalFunction>;
 #endif
     }
 }

src/storm/storage/expressions/Variable.h

@@ -130,9 +130,9 @@ namespace storm {
             bool hasRationalType() const;
 
             /*!
-             * Checks whether the variable is of boolean type.
+             * Checks whether the variable is of numerical type.
              *
-             * @return True iff the variable if of boolean type.
+             * @return True iff the variable if of numerical type.
              */
             bool hasNumericalType() const;