Refactored the AutoParser.

- Devided the AutoParser.h into .h and .cpp
- The AutoParser now is a stateless class
|- This resulted in changes to the interface between the parsers and the rest of the project.
|- The main() now directly acquires a shared_ptr to an AbstractModel from the call of the AutoParser and keeps ownership of it.
|- Additionally, the division into .h and .cpp lead to a move of includes from the header to the source. This caused several tests to need some model header to be included.
|- Tests are still showing green (except those needing Gurobi, which I do not have).

Next up: Parser.h/.cpp, then comments and making things look nice.)


Former-commit-id: f59b7405e5

src/counterexamples/PathBasedSubsystemGenerator.h

@@ -507,7 +507,7 @@ public:
 	/*!
 	 *
 	 */
-	static storm::models::Dtmc<T> computeCriticalSubsystem(storm::models::Dtmc<T>& model, storm::property::prctl::AbstractStateFormula<T> const& stateFormula) {
+	static storm::models::Dtmc<T> computeCriticalSubsystem(storm::models::Dtmc<T> & model, storm::property::prctl::AbstractStateFormula<T> const& stateFormula) {
 
 		//-------------------------------------------------------------
 		// 1. Strip and handle formulas

src/parser/AutoParser.cpp

@@ -0,0 +1,94 @@
+/*
+ * AutoParser.cpp
+ *
+ *  Created on: Jan 20, 2014
+ *      Author: Manuel S. Weiand
+ */
+
+#include "src/parser/AutoParser.h"
+
+#include "src/parser/Parser.h"
+
+#include "src/parser/DeterministicModelParser.h"
+#include "src/parser/NondeterministicModelParser.h"
+#include "src/parser/MarkovAutomatonParser.h"
+#include "src/exceptions/WrongFormatException.h"
+
+namespace storm {
+	namespace parser {
+
+		std::shared_ptr<storm::models::AbstractModel<double>> AutoParser::parseModel(std::string const & transitionSystemFile,
+																					 std::string const & labelingFile,
+																					 std::string const & stateRewardFile,
+																					 std::string const & transitionRewardFile) {
+
+			// Find and parse the model type hint.
+			storm::models::ModelType type = AutoParser::analyzeHint(transitionSystemFile);
+
+			// In case the hint string is unknown or could not be found, throw an exception.
+			if (type == storm::models::Unknown) {
+				LOG4CPLUS_ERROR(logger, "Could not determine file type of " << transitionSystemFile << ".");
+				LOG4CPLUS_ERROR(logger, "The first line of the file should contain a format hint. Please fix your file and try again.");
+				throw storm::exceptions::WrongFormatException() << "Could not determine type of file " << transitionSystemFile;
+			} else {
+				LOG4CPLUS_INFO(logger, "Model type seems to be " << type);
+			}
+
+			// Do the actual parsing.
+			std::shared_ptr<storm::models::AbstractModel<double>> model;
+			switch (type) {
+				case storm::models::DTMC: {
+					model.reset(new storm::models::Dtmc<double>(std::move(DeterministicModelParser::parseDtmc(transitionSystemFile, labelingFile, stateRewardFile, transitionRewardFile))));
+					break;
+				}
+				case storm::models::CTMC: {
+					model.reset(new storm::models::Ctmc<double>(std::move(DeterministicModelParser::parseCtmc(transitionSystemFile, labelingFile, stateRewardFile, transitionRewardFile))));
+					break;
+				}
+				case storm::models::MDP: {
+					model.reset(new storm::models::Mdp<double>(std::move(NondeterministicModelParser::parseMdp(transitionSystemFile, labelingFile, stateRewardFile, transitionRewardFile))));
+					break;
+				}
+				case storm::models::CTMDP: {
+					model.reset(new storm::models::Ctmdp<double>(std::move(NondeterministicModelParser::parseCtmdp(transitionSystemFile, labelingFile, stateRewardFile, transitionRewardFile))));
+					break;
+				}
+				case storm::models::MA: {
+					model.reset(new storm::models::MarkovAutomaton<double>(storm::parser::MarkovAutomatonParser::parseMarkovAutomaton(transitionSystemFile, labelingFile, stateRewardFile, transitionRewardFile)));
+					break;
+				}
+				default:
+					LOG4CPLUS_WARN(logger, "Unknown/Unhandled Model Type which cannot be parsed.");  // Unknown
+			}
+
+			return model;
+		}
+
+		storm::models::ModelType AutoParser::analyzeHint(const std::string& filename) {
+			storm::models::ModelType hintType = storm::models::Unknown;
+
+			// Find out the line endings used within the file.
+			storm::parser::SupportedLineEndingsEnum lineEndings = storm::parser::findUsedLineEndings(filename);
+
+			// Open the file.
+			MappedFile file(filename.c_str());
+			char* buf = file.data;
+
+			// Find and read in the hint.
+			char hint[128];
+			// %20s => The input hint can be AT MOST 120 chars long.
+			storm::parser::scanForModelHint(hint, sizeof(hint), buf, lineEndings);
+
+			for (char* c = hint; *c != '\0'; c++) *c = toupper(*c);
+
+			// Check if the hint value is known and store the appropriate enum value.
+			if (strncmp(hint, "DTMC", sizeof(hint)) == 0) hintType = storm::models::DTMC;
+			else if (strncmp(hint, "CTMC", sizeof(hint)) == 0) hintType = storm::models::CTMC;
+			else if (strncmp(hint, "MDP", sizeof(hint)) == 0) hintType = storm::models::MDP;
+			else if (strncmp(hint, "CTMDP", sizeof(hint)) == 0) hintType = storm::models::CTMDP;
+			else if (strncmp(hint, "MA", sizeof(hint)) == 0) hintType = storm::models::MA;
+
+			return hintType;
+		}
+	}
+}

src/parser/AutoParser.h

@@ -1,140 +1,49 @@
 #ifndef STORM_PARSER_AUTOPARSER_H_
 #define STORM_PARSER_AUTOPARSER_H_
 
-#include "src/parser/Parser.h"
 #include "src/models/AbstractModel.h"
 
-#include "src/exceptions/WrongFormatException.h"
-#include "src/models/AbstractModel.h"
-#include "src/parser/DeterministicModelParser.h"
-#include "src/parser/NondeterministicModelParser.h"
-#include "src/parser/MarkovAutomatonParser.h"
-
-#include <memory>
-#include <iostream>
-#include <utility>
 #include <string>
-#include <cctype>
 
 namespace storm {
-
-namespace parser {
-
-/*!
- *	@brief Checks the given files and parses the model within these files.
- *
- *	This parser analyzes the format hint in the first line of the transition
- *	file. If this is a valid format, it will use the parser for this format,
- *	otherwise it will throw an exception.
- *
- *	When the files are parsed successfully, the parsed ModelType and Model
- *	can be obtained via getType() and getModel<ModelClass>().
- */
-template<class T>
-class AutoParser {
-	public:
-		AutoParser(std::string const & transitionSystemFile, std::string const & labelingFile,
-				std::string const & stateRewardFile = "", std::string const & transitionRewardFile = "") : model(nullptr) {
-			storm::models::ModelType type = this->analyzeHint(transitionSystemFile);
-
-			if (type 


	
	
	
	sp/tempestpy -  tempestpy - Gitea: Git with a cup of tea 
	
	
	
	
	
	
	
	
	
	
	

	
		window.config = {
			AppVer: '1.14.5',
			AppSubUrl: '',
			StaticUrlPrefix: '',
			UseServiceWorker:  true ,
			csrf: 'HVp4_rrX8YP74Z_I3az1ug_L8cs6MTczNzYxNTkxMjgwMjczNTk3Ng',
			HighlightJS: false,
			SimpleMDE: false,
			Tribute: false,
			NotificationSettings: {
				MinTimeout:  10000 ,
				TimeoutStep:   10000 ,
				MaxTimeout:  60000 ,
				EventSourceUpdateTime:  10000 ,
			},
			EnableTimetracking: true,
			PageIsProjects: false,
			
		};
	
	
	

	
	
		
			.dropdown:hover > .menu { display: block; }
			.ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
		
	
	

	
		
		
		
	
	
	
		
	



	




	

	
		This website works better with JavaScript.

		

		
			
				
	
		
			
		
		
			
		
	

	
		Home
		Explore
	

	

	


	
		Help
		
			
				
					 Register
				
			
			
				 Sign In
			
		
	


			
		



	

	
		
			
				
					
					
						
	
		
			
		
	


					
					sp
					/
					tempestpy
					
						
							
								
							
						
						
					
				
				
				
				
			
			
				
					
					
						
						
							
								Watch
							
							
								1
							
						
					
					
						
						
							
								Star
							
							
								0
							
						
					
					
						
							
								Fork
							
							
								0
							
						
					
				
			
		
	

	
		
			
				
				
					 Code
				
				

				
					
						 Issues
						
					
				

				

				
					
						 Pull Requests
						
					
				

				
					
						 Projects
						
					
				

				
				
					 Releases
					
				
				

				
					
						 Wiki
					
				

				
					
						 Activity
					
				

				

				
			
		
	
	


	
		



		
			
				
				
			
			
		
		
		
		
		
		
		
			You can not select more than 25 topics
			Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
		
		
		
	
		
			
				
					 75 Commits
				
				
					 1 Branch
				
				
					
						 0 Tags
					
				
				
					 2.1 MiB
				
			
		
	
	


		
			
	
		
			
				
				Tree:
				4bfa6776ed
			
			
		
		
			
				refactoring
			
			
		
		
			
				
				
			
			
				
					
						
							
								Branches
							
						
						
							
								Tags
							
						
					
				
			
			
				${ item.name }
				
					
						
							
							Create tag ${ searchTerm }
						
						
							
							Create branch ${ searchTerm }
						
						
							
								from '4bfa6776ed'
							
						
					
					
						
						
						
					
				
			
			${ noResults }
		
	


			
			
			
			
				tempestpy/doc/Makefile
			
			
				
					
						
						
					
					
				

			
			
				
			
			
				
				
			
		
		
			
	
		
			
				
					19 lines
				
				608 B
			
		
		
			
				Raw
				
				Normal View
				History
			
		
	
    
		
			
				
					
						first version of docu
8 years ago​​​​​​​​​​​​​​​​​​​
						
						# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS    =SPHINXBUILD   = sphinx-buildSPHINXPROJ    = stormpySOURCEDIR     = sourceBUILDDIR      = build
# Put it first so that "make" without argument is like "make help".
help:	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
.PHONY: help Makefile
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
					
				
			
		
    


		
	



	

	

	

	
	
		
			Powered by Gitea Version: 1.14.5 Page: 425ms Template: 2ms
		
		
			
			
				
				English
				
					
						English
					
						简体中文
					
						繁體中文（香港）
					
						繁體中文（台灣）
					
						Deutsch
					
						français
					
						Nederlands
					
						latviešu
					
						русский
					
						Українська
					
						日本語
					
						español
					
						português do Brasil
					
						Português de Portugal
					
						polski
					
						български
					
						italiano
					
						suomi
					
						Türkçe
					
						čeština
					
						српски
					
						svenska
					
						한국어
					
				
			
			Licenses
			API
			Website
			
			Go1.16.6
		
	







	





0
# Minimal makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS    =
SPHINXBUILD   = sphinx-build
SPHINXPROJ    = stormpy
SOURCEDIR     = source
BUILDDIR      = build
# Put it first so that "make" without argument is like "make help".
help:
	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
.PHONY: help Makefile
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)