From: jkauttio Date: Thu, 4 Sep 2014 11:03:45 +0000 (+0000) Subject: Create a new branch for BPMN import prototype X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=77fda749551e2cbba552e38d5dbae7f8d4af3ae1;p=simantics%2Fsysdyn.git Create a new branch for BPMN import prototype refs #5197 git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/bpmn-import@30211 ac1ea38d-2e2b-0410-8846-a27921b304fc --- diff --git a/org.simantics.sysdyn/.classpath b/org.simantics.sysdyn/.classpath new file mode 100644 index 00000000..8a8f1668 --- /dev/null +++ b/org.simantics.sysdyn/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.simantics.sysdyn/.hgignore b/org.simantics.sysdyn/.hgignore new file mode 100644 index 00000000..73df90f6 --- /dev/null +++ b/org.simantics.sysdyn/.hgignore @@ -0,0 +1,5 @@ +syntax: regexp +^bin/ + +syntax: glob +*.svn/* \ No newline at end of file diff --git a/org.simantics.sysdyn/.project b/org.simantics.sysdyn/.project new file mode 100644 index 00000000..05d44396 --- /dev/null +++ b/org.simantics.sysdyn/.project @@ -0,0 +1,28 @@ + + + org.simantics.sysdyn + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..785aae6f --- /dev/null +++ b/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +#Mon Nov 16 15:37:44 EET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/org.simantics.sysdyn/META-INF/MANIFEST.MF b/org.simantics.sysdyn/META-INF/MANIFEST.MF new file mode 100644 index 00000000..66b45852 --- /dev/null +++ b/org.simantics.sysdyn/META-INF/MANIFEST.MF @@ -0,0 +1,61 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Simantics System Dynamics +Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true +Bundle-Version: 1.8.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.simantics.objmap;bundle-version="0.1.0", + org.simantics.db;bundle-version="0.6.2", + org.simantics.modelica;bundle-version="1.0.0", + org.simantics.db.common;bundle-version="0.8.0", + org.simantics.simulation;bundle-version="1.0.0", + org.eclipse.ui.console;bundle-version="3.4.0", + org.eclipse.core.runtime;bundle-version="3.5.0", + org.eclipse.jface;bundle-version="3.5.2", + org.simantics.project;bundle-version="1.0.0", + org.simantics.layer0.utils;bundle-version="0.8.0", + org.simantics.layer0;bundle-version="1.0.0", + org.simantics.structural.ontology;bundle-version="1.0.0", + org.simantics.sysdyn.ontology;bundle-version="1.0.0", + org.simantics.modeling;bundle-version="1.1.1", + org.simantics.diagram;bundle-version="1.1.1", + org.simantics.diagram.ontology;bundle-version="1.1.1", + org.simantics.scl.runtime;bundle-version="0.1.3", + org.simantics.db.layer0;bundle-version="1.1.0", + org.simantics.spreadsheet.common;bundle-version="1.1.0", + org.simantics.spreadsheet;bundle-version="1.1.0", + org.eclipse.jface.text;bundle-version="3.6.1", + org.simantics.spreadsheet.ontology;bundle-version="1.2.0", + org.simantics.fmu;bundle-version="1.0.0", + org.simantics.issues;bundle-version="1.1.0", + org.simantics.issues.common;bundle-version="1.1.0", + org.simantics.jfreechart;bundle-version="1.0.0", + org.jfree.jchart;bundle-version="1.0.13", + org.jfree.jcommon;bundle-version="1.0.16", + org.simantics.spreadsheet.graph;bundle-version="1.1.0", + fi.semantum.sysdyn.solver;bundle-version="0.1.0" +Export-Package: org.simantics.sysdyn, + org.simantics.sysdyn.adapter, + org.simantics.sysdyn.elementaryCycles, + org.simantics.sysdyn.expressionParser, + org.simantics.sysdyn.manager, + org.simantics.sysdyn.modelExport, + org.simantics.sysdyn.modelImport, + org.simantics.sysdyn.modelImport.model, + org.simantics.sysdyn.modelParser, + org.simantics.sysdyn.modelica, + org.simantics.sysdyn.representation, + org.simantics.sysdyn.representation.expressions, + org.simantics.sysdyn.representation.utils, + org.simantics.sysdyn.representation.visitors, + org.simantics.sysdyn.simulation, + org.simantics.sysdyn.solver, + org.simantics.sysdyn.tableParser, + org.simantics.sysdyn.utils, + org.simantics.sysdyn.utils.imports +Bundle-Activator: org.simantics.sysdyn.Activator +Bundle-ActivationPolicy: lazy +Import-Package: org.eclipse.ui, + org.simantics.sysdyn.utils, + org.simantics.ui +Bundle-Vendor: VTT Technical Reserarch Centre of Finland diff --git a/org.simantics.sysdyn/ModelicaParser.html b/org.simantics.sysdyn/ModelicaParser.html new file mode 100644 index 00000000..157b944c --- /dev/null +++ b/org.simantics.sysdyn/ModelicaParser.html @@ -0,0 +1,727 @@ + + + +BNF for ModelicaParser.jj + + +

BNF for ModelicaParser.jj

TOKENS

+ + + + + + + + + + + + + +

+/*** Lexer *********************************************************/

+<DEFAULT> SKIP : {
+<WHITESPACE: " " | "\n" | "\r" | "\t">
+| <COMMENT1: "/*" (~["*"] | "*" ~["/"])* "*/">
+| <COMMENT2: "//" (~["\n"])*>
+}
+
+

+<DEFAULT> TOKEN : {
+"algorithm"
+| "discrete"
+| "false"
+| "model"
+| "redeclare"
+| "and"
+| "each"
+| "final"
+| "not"
+| "replaceable"
+| "annotation"
+| "else"
+| "flow"
+| "operator"
+| "return"
+| "assert"
+| "elseif"
+| "for"
+| "or"
+| "stream"
+| "block"
+| "elsewhen"
+| "function"
+| "outer"
+| "then"
+| "break"
+| "encapsulated"
+| "if"
+| "output"
+| "true"
+| "class"
+| "end"
+| "import"
+| "package"
+| "type"
+| "connect"
+| "enumeration"
+| "in"
+| "parameter"
+| "when"
+| "connector"
+| "equation"
+| "initial"
+| "partial"
+| "while"
+| "constant"
+| "expandable"
+| "inner"
+| "protected"
+| "within"
+| "constrainedby"
+| "extends"
+| "input"
+| "public"
+| "der"
+| "external"
+| "loop"
+| "record"
+| "("
+| ")"
+| "{"
+| "}"
+| "["
+| "]"
+| "."
+| ":"
+| ";"
+| ","
+| "<"
+| "<="
+| ">"
+| ">="
+| "=="
+| "<>"
+| "+"
+| "-"
+| ".+"
+| ".-"
+| "*"
+| "/"
+| ".*"
+| "./"
+| "^"
+| ".^"
+| "="
+| ":="
+| <IDENT: ["a"-"z","A"-"Z","_"] (["a"-"z","A"-"Z","_","0"-"9"])*>
+| <STRING: "\"" (~["\"","\\","\n"] | "\\" ~["\n"])* "\""> : {
+| <UNSIGNED_INTEGER: (["0"-"9"])+>
+| <UNSIGNED_NUMBER: <UNSIGNED_INTEGER> "." (<UNSIGNED_INTEGER>)? (["e","E"] <UNSIGNED_INTEGER>)? | "." <UNSIGNED_INTEGER> (["e","E"] <UNSIGNED_INTEGER>)? | <UNSIGNED_INTEGER> ["e","E"] <UNSIGNED_INTEGER>>
+}
+
+

NON-TERMINALS

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +/* Parser *****************************************************/ + +// https://javacc.dev.java.net/doc/javaccgrm.html +// add_op -> add_op() +// [ add_op ] -> ( add_op() )? +// { add_op term } -> ( add_op() term() ) + +
parse	::=	stored_definition <EOF>
+ +/* Stored Definition - Within **********************************/ +
stored_definition	::=	( "within" ( name )? ";" )? ( ( "final" )? class_definition ";" )*
+ +/* Class Definition ********************************************/ +
class_definition	::=	( "encapsulated" )? ( "partial" )? ( "class" \| "model" \| "record" \| "block" \| ( "expandable" )? "connector" \| "type" \| "package" \| "function" \| "operator" \| "operator function" \| "operator record" ) class_specifier
class_specifier	::=	<IDENT> string_comment composition "end" <IDENT>
	\|	<IDENT> "=" base_prefix name ( array_subscripts )? ( class_modification )? comment
	\|	<IDENT> "=" "enumeration" "(" ( ( enum_list )? \| ":" ) ")" comment
	\|	<IDENT> "=" "der" "(" name "," <IDENT> ( "," <IDENT> )* ")" comment
	\|	"extends" <IDENT> ( class_modification )? string_comment composition "end" <IDENT>
base_prefix	::=	type_prefix
enum_list	::=	enumeration_literal ( "," enumeration_literal )*
enumeration_literal	::=	<IDENT> comment
parse_composition	::=	composition <EOF>
composition	::=	element_list ( "public" element_list \| "protected" element_list \| equation_section \| algorithm_section )* ( "external" ( language_specification )? ( external_function_call )? ( annotation )? ";" )? ( annotation ";" )?
language_specification	::=	<STRING>
external_function_call	::=	( component_reference "=" )? <IDENT> "(" ( expression_list )? ")"
element_list	::=	( element ";" )*
element	::=	import_clause
	\|	extends_clause
	\|	( "redeclare" )? ( "final" )? ( "inner" )? ( "outer" )? ( ( class_definition \| component_clause ) \| "replaceable" ( class_definition \| component_clause ) ( constraining_clause comment )? )
import_clause	::=	"import" ( <IDENT> "=" name \| name ( "." "*" )? ) comment
+ +/* Extends *****************************************************/ +
extends_clause	::=	"extends" name ( class_modification )? ( annotation )?
constraining_clause	::=	"constrainedby" name ( class_modification )?
+ +/* Component Clause ********************************************/ +
component_clause	::=	( type_prefix ) ( type_specifier ) ( array_subscripts )? ( component_list )
type_prefix	::=	( "flow" \| "stream" )? ( "discrete" \| "parameter" \| "constant" )? ( "output" \| "input" )?
type_specifier	::=	name
component_list	::=	component_declaration ( "," component_declaration )*
component_declaration	::=	declaration ( conditional_attribute )? comment
conditional_attribute	::=	"if" expression
declaration	::=	<IDENT> ( array_subscripts )? ( modification )?
+ +/* Modification ********************************************/ +
modification	::=	( class_modification ( "=" expression )? \| "=" expression \| ":=" expression )
class_modification	::=	"(" ( argument_list )? ")"
argument_list	::=	argument ( "," argument )*
argument	::=	element_modification_or_replaceable
	\|	element_redeclaration
element_modification_or_replaceable	::=	( "each" )? ( "final" )? ( element_modification \| element_replaceable )
element_modification	::=	name ( modification )? string_comment
element_redeclaration	::=	"redeclare" ( "each" )? ( "final" )? ( ( class_definition \| component_clause1 ) \| element_replaceable )
element_replaceable	::=	"replaceable" ( class_definition \| component_clause1 ) ( constraining_clause )?
component_clause1	::=	type_prefix type_specifier component_declaration1
component_declaration1	::=	declaration comment
+ +/* Equations ***********************************************/ +
equation_section	::=	( "initial" )? "equation" ( equation ";" )*
algorithm_section	::=	( "initial" )? "algorithm" ( statement ";" )*
equation	::=	( simple_expression "=" expression \| if_equation \| for_equation \| connect_clause \| when_equation \| <IDENT> function_call_args ) comment
statement	::=	( component_reference ( ":=" expression \| function_call_args ) \| "(" output_expression_list ")" ":=" component_reference function_call_args \| "break" \| "return" \| if_statement \| for_statement \| while_statement \| when_statement ) comment
if_equation	::=	"if" expression "then" ( equation ";" )* ( "elseif" expression "then" ( equation ";" )* )* ( "else" ( equation ";" )* )? "end" "if"
if_statement	::=	"if" expression "then" ( statement ";" )* ( "elseif" expression "then" ( statement ";" )* )* ( "else" ( statement ";" )* )? "end" "if"
for_equation	::=	"for" for_indices "loop" ( equation ";" )* "end" "for"
for_statement	::=	"for" for_indices "loop" ( statement ";" )* "end" "for"
for_indices	::=	for_index ( "," for_index )*
for_index	::=	<IDENT> ( "in" expression )?
while_statement	::=	"while" expression "loop" ( statement ";" )* "end" "while"
when_equation	::=	"when" expression "then" ( equation ";" )* ( "elsewhen" expression "then" ( equation ";" )* )* "end" "when"
when_statement	::=	"when" expression "then" ( statement ";" )* ( "elsewhen" expression "then" ( statement ";" )* )* "end" "when"
connect_clause	::=	"connect" "(" component_reference "," component_reference ")"
+ +/* Expressions *************************************************/ +
expr	::=	simple_expression <EOF>
	\|	"if" expression "then" expression ( "elseif" expression "then" expression )* "else" expression <EOF>
expression	::=	simple_expression
	\|	"if" expression "then" expression ( "elseif" expression "then" expression )* "else" expression
simple_expression	::=	logical_expression ( ":" logical_expression ( ":" logical_expression )? )?
logical_expression	::=	logical_term ( "or" logical_term )*
logical_term	::=	logical_factor ( "and" logical_factor )*
logical_factor	::=	( "not" )? relation
relation	::=	arithmetic_expression ( rel_op arithmetic_expression )?
rel_op	::=	"<"
	\|	"<="
	\|	">"
	\|	">="
	\|	"=="
	\|	"<>"
arithmetic_expression	::=	( add_op )? term ( add_op term )*
add_op	::=	"+"
	\|	"-"
	\|	".+"
	\|	".-"
term	::=	factor ( mul_op factor )*
mul_op	::=	"*"
	\|	"/"
	\|	".*"
	\|	"./"
factor	::=	primary ( "^" \| ".^" primary )?
primary	::=	<UNSIGNED_NUMBER>
	\|	<UNSIGNED_INTEGER>
	\|	<STRING>
	\|	"false"
	\|	"true"
	\|	( name \| "der" \| "initial" ) function_call_args
	\|	component_reference
	\|	"(" expression ")"
	\|	"[" expression_list ( ";" expression_list )* "]"
	\|	"{" function_arguments "}"
	\|	"end"
name	::=	( "." )? <IDENT> ( "." <IDENT> )*
component_reference	::=	( "." )? <IDENT> ( array_subscripts )? ( "." <IDENT> ( array_subscripts )? )*
function_call_args	::=	"(" ( function_arguments )? ")"
function_arguments	::=	expression ( "," function_arguments \| "for" for_indices )?
	\|	named_arguments
named_arguments	::=	named_argument ( "," named_arguments )?
named_argument	::=	<IDENT> "=" expression
output_expression_list	::=	( expression )? ( "," ( expression )? )*
expression_list	::=	expression ( "," expression )*
array_subscripts	::=	"[" subscript ( "," subscript )* "]"
subscript	::=	":"
	\|	expression
comment	::=	string_comment ( annotation )?
string_comment	::=	( <STRING> ( "+" <STRING> )* )?
annotation	::=	"annotation" class_modification

+ + diff --git a/org.simantics.sysdyn/adapters.xml b/org.simantics.sysdyn/adapters.xml new file mode 100644 index 00000000..c01c1f80 --- /dev/null +++ b/org.simantics.sysdyn/adapters.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.simantics.sysdyn/bpmn/BPMN20.xsd b/org.simantics.sysdyn/bpmn/BPMN20.xsd new file mode 100644 index 00000000..463ef6e6 --- /dev/null +++ b/org.simantics.sysdyn/bpmn/BPMN20.xsd @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.simantics.sysdyn/bpmn/BPMNDI.xsd b/org.simantics.sysdyn/bpmn/BPMNDI.xsd new file mode 100644 index 00000000..615740f4 --- /dev/null +++ b/org.simantics.sysdyn/bpmn/BPMNDI.xsd @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.simantics.sysdyn/bpmn/DC.xsd b/org.simantics.sysdyn/bpmn/DC.xsd new file mode 100644 index 00000000..80e9fa8b --- /dev/null +++ b/org.simantics.sysdyn/bpmn/DC.xsd @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.simantics.sysdyn/bpmn/DI.xsd b/org.simantics.sysdyn/bpmn/DI.xsd new file mode 100644 index 00000000..97f1bcff --- /dev/null +++ b/org.simantics.sysdyn/bpmn/DI.xsd @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.simantics.sysdyn/bpmn/Semantic.xsd b/org.simantics.sysdyn/bpmn/Semantic.xsd new file mode 100644 index 00000000..1c611dad --- /dev/null +++ b/org.simantics.sysdyn/bpmn/Semantic.xsd @@ -0,0 +1,1562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.simantics.sysdyn/bpmn/generate.bat b/org.simantics.sysdyn/bpmn/generate.bat new file mode 100644 index 00000000..ed17066a --- /dev/null +++ b/org.simantics.sysdyn/bpmn/generate.bat @@ -0,0 +1,2 @@ +"C:\Program Files\Java\jdk1.7.0_51\bin\xjc" -target 2.1 -d ../src -p org.simantics.sysdyn.modelImport.bpmn BPMN20.xsd +pause \ No newline at end of file diff --git a/org.simantics.sysdyn/bpmn/helloworld.xml b/org.simantics.sysdyn/bpmn/helloworld.xml new file mode 100644 index 00000000..1e1d5f2d --- /dev/null +++ b/org.simantics.sysdyn/bpmn/helloworld.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.simantics.sysdyn/build.properties b/org.simantics.sysdyn/build.properties new file mode 100644 index 00000000..26e468c9 --- /dev/null +++ b/org.simantics.sysdyn/build.properties @@ -0,0 +1,18 @@ +############################################################################### +# Copyright (c) 2010 Association for Decentralized Information Management in +# Industry THTH ry. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# VTT Technical Research Centre of Finland - initial API and implementation +############################################################################### +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + adapters.xml,\ + plugin.xml,\ + scl/ diff --git a/org.simantics.sysdyn/plugin.xml b/org.simantics.sysdyn/plugin.xml new file mode 100644 index 00000000..965913ce --- /dev/null +++ b/org.simantics.sysdyn/plugin.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl new file mode 100644 index 00000000..878dffb5 --- /dev/null +++ b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl @@ -0,0 +1,110 @@ +include "UI/Progress" +include "Simantics/DB" +include "Simantics/Variables" + +importJava "org.simantics.sysdyn.utils.DocumentationUtils" where + + @JavaName getModules + getModules :: Variable -> [Resource] + + @JavaName getExperimentVariables + getExperimentVariables :: Variable -> [Variable] + + @JavaName getRoleVariables + getRoleVariables :: Variable -> [Variable] + + @JavaName getDocumentVariables + getDocumentVariables :: Variable -> [Variable] + + @JavaName getIndexDocuments + getIndexDocuments :: Variable -> [Variable] + + @JavaName getResultVariables + getResultVariables :: Variable -> [Variable] + + @JavaName getConfiguration + getConfiguration :: Resource -> Resource + + @JavaName getConfigurationVariables + getConfigurationVariables :: Resource -> [Resource] + + @JavaName getName + getName :: Resource -> String + + @JavaName getType + getType :: Resource -> String + + @JavaName getUnit + getUnit :: Resource -> String + + @JavaName getVariability + getVariability :: Resource -> String + + @JavaName getDescription + getDescription :: Resource -> String + + @JavaName getDocumentationDefinition + getDocumentationDefinition :: Resource -> String + + + + @JavaName numberOfVariables + numberOfVariables :: Resource -> Boolean -> Integer + + @JavaName totalNumberOfVariables + totalNumberOfVariables :: Resource -> Boolean -> Integer + + @JavaName numberOfStocks + numberOfStocks :: Resource -> Boolean -> Integer + + @JavaName numberOfValves + numberOfValves :: Resource -> Boolean -> Integer + + @JavaName numberOfInputs + numberOfInputs :: Resource -> Boolean -> Integer + + @JavaName numberOfShadows + numberOfShadows :: Resource -> Boolean -> Integer + + @JavaName numberOfAuxiliaries + numberOfAuxiliaries :: Resource -> Boolean -> Integer + + @JavaName numberOfModules + numberOfModules :: Resource -> Boolean -> Integer + + @JavaName numberOfSheets + numberOfSheets :: Resource -> Boolean -> Integer + + @JavaName numberOfModuleTypes + numberOfModuleTypes :: Variable -> Integer + + @JavaName base64Encode + base64Encode :: Variable -> String -> String + + @JavaName formatDate + formatDate :: Long -> String + + @JavaName importModel + importModel :: String -> Resource + + @JavaName isParameter + isParameter :: Variable -> Boolean + + lastValue :: Resource -> String -> String -> Double + lastValue2 :: Variable -> String -> Variable + currentValue :: Variable -> String -> Variable + lastValueIndexed :: Variable -> String -> Variable + equation :: Variable -> String -> Variable + +importJava "org.simantics.sysdyn.manager.SysdynExperiments" where + + activateExperiment :: Resource -> String + run :: String -> () + saveIC :: Variable -> String -> Maybe Resource + assignIC :: Variable -> String -> () + deassignIC :: Variable -> () + applyIC :: Variable -> String -> () + deleteIC :: Variable -> String -> () + + setPublishResults :: Variable -> Boolean -> () + \ No newline at end of file diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/Activator.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/Activator.java new file mode 100644 index 00000000..640c85fe --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/Activator.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2010 Association for Decentralized Information Management in + * Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * VTT Technical Research Centre of Finland - initial API and implementation + *******************************************************************************/ +package org.simantics.sysdyn; + +import java.io.File; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext bundleContext; + + // The plug-in ID + public static final String PLUGIN_ID = "org.simantics.sysdyn"; + + // The shared instance + private static Activator plugin; + + @Override + public void start(BundleContext context) throws Exception { + bundleContext = context; + File modelsDir = Activator.getBundleContext().getDataFile("models"); + if (!modelsDir.exists()) { + modelsDir.mkdir(); + } + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + File modelsDir = Activator.getBundleContext().getDataFile("models"); + if (modelsDir.exists()) { + recursiveDelete(modelsDir); + } + plugin = null; + + } + + public static Activator getDefault() { + return plugin; + } + + public static BundleContext getBundleContext() { + return bundleContext; + } + + private static boolean recursiveDelete(File fileOrDir) { + if(fileOrDir.isDirectory()) + for(File innerFile: fileOrDir.listFiles()) + if(!recursiveDelete(innerFile)) + return false; + return fileOrDir.delete(); + } +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/Functions.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/Functions.java new file mode 100644 index 00000000..04c2b623 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/Functions.java @@ -0,0 +1,269 @@ +package org.simantics.sysdyn; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import org.simantics.databoard.Bindings; +import org.simantics.databoard.binding.Binding; +import org.simantics.databoard.binding.mutable.Variant; +import org.simantics.db.ReadGraph; +import org.simantics.db.Resource; +import org.simantics.db.WriteGraph; +import org.simantics.db.common.request.ResourceRead; +import org.simantics.db.common.uri.UnescapedChildMapOfResource; +import org.simantics.db.common.utils.ListUtils; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.function.All; +import org.simantics.db.layer0.variable.StandardGraphChildVariable; +import org.simantics.db.layer0.variable.ValueAccessor; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.db.layer0.variable.VariableMap; +import org.simantics.db.layer0.variable.VariableMapImpl; +import org.simantics.layer0.Layer0; +import org.simantics.operation.Layer0X; +import org.simantics.scl.reflection.annotations.SCLValue; +import org.simantics.structural.stubs.StructuralResource2; +import org.simantics.sysdyn.adapter.ActiveDatasetsIndexVariable; +import org.simantics.sysdyn.adapter.NamesIndexVariable; +import org.simantics.sysdyn.adapter.TimeIndexVariable; +import org.simantics.sysdyn.adapter.TimesIndexVariable; +import org.simantics.sysdyn.adapter.ValueIndexVariable; +import org.simantics.sysdyn.adapter.ValueIndexVariableI; +import org.simantics.sysdyn.adapter.ValuesIndexVariable; + +public class Functions { + + public static String VALUE = "value"; + public static String VALUES = "values"; + public static String TIME = "time"; + public static String TIMES = "times"; + public static String NAMES = "names"; + public static String ACTIVE_DATASETS = "activeDatasets"; + + @SCLValue(type = "ValueAccessor") + public static ValueAccessor valuePropertyValue = new ValueAccessor() { + + @Override + public Object getValue(ReadGraph graph, Variable context) + throws DatabaseException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getValue(ReadGraph graph, Variable context, + Binding binding) throws DatabaseException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setValue(WriteGraph graph, Variable context, Object value) + throws DatabaseException { + // TODO Auto-generated method stub + + } + + @Override + public void setValue(WriteGraph graph, Variable context, Object value, + Binding binding) throws DatabaseException { + // TODO Auto-generated method stub + + } + + }; + + @SCLValue(type = "ValueAccessor") + public static ValueAccessor equationPropertyValue = new ValueAccessor() { + + @Override + public Object getValue(ReadGraph graph, Variable context) throws DatabaseException { + return getValue(graph, context, Bindings.STRING); + } + + @Override + public Object getValue(ReadGraph graph, Variable context, Binding binding) throws DatabaseException { + + Variable v = context.getParent(graph); + + Resource represents = v.getPossibleRepresents(graph); + if(represents != null) { + SysdynResource SYSDYN = SysdynResource.getInstance(graph); + Collection res = ListUtils.toList(graph, graph.getSingleObject(represents, SYSDYN.Variable_expressionList)); + if(res.size() == 1) { + Resource exp = res.iterator().next(); + String text = graph.getRelatedValue(exp, SYSDYN.Expression_equation, Bindings.STRING); + return text; + } + } + + return null; + + } + + @Override + public void setValue(WriteGraph graph, Variable context, Object value) throws DatabaseException { + + if(value instanceof Variant) value = ((Variant)value).getValue(); + + if(!(value instanceof String)) throw new DatabaseException("Unexpected value " + value + ", expected String"); + + setValue(graph, context, value, Bindings.STRING); + + } + + @Override + public void setValue(WriteGraph graph, Variable context, Object value, Binding binding) throws DatabaseException { + + if(value instanceof Variant) value = ((Variant)value).getValue(); + + if(!(value instanceof String)) throw new DatabaseException("Unexpected value " + value + ", expected String"); + + Variable v = context.getParent(graph); + + Resource represents = v.getPossibleRepresents(graph); + if(represents != null) { + SysdynResource SYSDYN = SysdynResource.getInstance(graph); + Collection res = ListUtils.toList(graph, graph.getSingleObject(represents, SYSDYN.Variable_expressionList)); + if(res.size() == 1) { + Resource exp = res.iterator().next(); + graph.claimLiteral(exp, SYSDYN.Expression_equation, value, Bindings.STRING); + } + } + + } + + }; + + + @SCLValue(type = "VariableMap") + public static VariableMap runProperties = new VariableMapImpl() { + + @Override + public Variable getVariable(ReadGraph graph, Variable context, String name) throws DatabaseException { + + String property = context.getName(graph); + if(TIME.equals(property)) + return new TimeIndexVariable(graph, context, name); + else + return null; + } + + @Override + public Map getVariables(ReadGraph graph, Variable context, Map map) throws DatabaseException { + return map; + } + }; + + @SCLValue(type = "VariableMap") + public static VariableMap valuePropertyProperties = new VariableMapImpl() { + + @Override + public Variable getVariable(ReadGraph graph, Variable context, String name) throws DatabaseException { + + String property = context.getName(graph); + if(VALUE.equals(property)) + if(name.startsWith("$")) { + Integer index = Integer.parseInt(name.substring(1)); + return new ValueIndexVariableI(graph, context, index); + } else { + return new ValueIndexVariable(graph, context, name); + } + else if(VALUES.equals(property)) + return new ValuesIndexVariable(graph, context, name); + else if(TIMES.equals(property)) + return new TimesIndexVariable(graph, context, name); + else if(TIME.equals(property)) + return new TimeIndexVariable(graph, context, name); + else if(NAMES.equals(property)) + return new NamesIndexVariable(graph, context, name); + else if(ACTIVE_DATASETS.equals(property)) + return new ActiveDatasetsIndexVariable(graph, context, name); + else + return null; + } + + @Override + public Map getVariables(ReadGraph graph, Variable context, Map map) throws DatabaseException { + return map; +// Collections.emptyList(); +// StandardGraphChildVariable variable = (StandardGraphChildVariable)context; +// collectPropertiesFromContext(graph, variable, variable.resource, map); + } + + }; + + + @SCLValue(type = "VariableMap") + public static VariableMap runChildren = new VariableMapImpl() { + + @Override + public Variable getVariable(ReadGraph graph, Variable context, String name) throws DatabaseException { + StandardGraphChildVariable variable = (StandardGraphChildVariable)context; + Map children = graph.syncRequest(new StructuralChildMapOfResource(getConfiguration(graph, variable))); + Resource child = children.get(name); + if(child == null) return All.getStandardChildDomainChildVariable(graph, context, name); + return graph.getPossibleContextualAdapter(child, variable, Variable.class, Variable.class); + } + + @Override + public Map getVariables(ReadGraph graph, Variable context, Map map) throws DatabaseException { + + StandardGraphChildVariable variable = (StandardGraphChildVariable)context; + + map = All.getStandardChildDomainChildVariables(graph, context, map); + + for(Map.Entry entry : graph.syncRequest(new StructuralChildMapOfResource(getConfiguration(graph, variable))).entrySet()) { + String name = entry.getKey(); + Resource child = entry.getValue(); + Variable var = graph.getPossibleContextualAdapter(child, variable, Variable.class, Variable.class); + if(var != null) { + if(map == null) map = new HashMap(); + map.put(name, var); + } else { + System.err.println("No adapter for " + child + " in " + variable.getURI(graph)); + } + } + + return map; + + } + + Resource getConfiguration(ReadGraph graph, Variable run) throws DatabaseException { + Layer0 L0 = Layer0.getInstance(graph); + Layer0X L0X = Layer0X.getInstance(graph); + Resource experiment = graph.getPossibleObject(run.getRepresents(graph), L0.PartOf); + Resource model = graph.getPossibleObject(experiment, L0.PartOf); + return graph.getPossibleObject(model, L0X.HasBaseRealization); + } + + }; + + + static class StructuralChildMapOfResource extends ResourceRead> { + + public StructuralChildMapOfResource(Resource resource) { + super(resource); + } + + @Override + public Map perform(ReadGraph graph) throws DatabaseException { + + StructuralResource2 STR = StructuralResource2.getInstance(graph); + Map directChildren = graph.syncRequest(new UnescapedChildMapOfResource(resource)); + Resource type = graph.getPossibleType(resource, STR.Component); + if(type != null) { + Resource definition = graph.getPossibleObject(type, STR.IsDefinedBy); + if(definition != null) { + return graph.syncRequest(new UnescapedChildMapOfResource(definition)); + } + } + + return directChildren; + + } + + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/TestParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/TestParser.java new file mode 100644 index 00000000..86b3245c --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/TestParser.java @@ -0,0 +1,233 @@ +/******************************************************************************* + * Copyright (c) 2013-2014 Association for Decentralized Information Management in + * Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Semantum Oy - initial API and implementation + * VTT Technical Research Centre of Finland + *******************************************************************************/ +package org.simantics.sysdyn; + +import java.io.StringReader; +import java.util.HashMap; + +import org.simantics.sysdyn.unitParser.ParseException; +import org.simantics.sysdyn.unitParser.UnitCheckingException; +import org.simantics.sysdyn.unitParser.UnitCheckingNode; +import org.simantics.sysdyn.unitParser.UnitParser; +import org.simantics.sysdyn.unitParser.nodes.UnitResult; +import org.simantics.sysdyn.utils.Function; + +public class TestParser { + + /** + * @param args + */ + public static void main(String[] args) { + + HashMap units = new HashMap(); + boolean allowEquivalents = true; + + doScenario(scenario1(units), units, allowEquivalents); + doScenario(scenario2(units), units, allowEquivalents); + doScenario(scenario3(units), units, allowEquivalents); + doScenario(scenario4(units), units, allowEquivalents); + doScenario(scenario5(units), units, allowEquivalents); + doScenario(scenario6(units), units, allowEquivalents); + doScenario(scenario7(units), units, allowEquivalents); + doScenario(scenario8(units), units, allowEquivalents); + doScenario(scenario9(units), units, allowEquivalents); + doScenario(scenario10(units), units, allowEquivalents); + doScenario(scenario11(units), units, allowEquivalents); + doScenario(scenario12(units), units, allowEquivalents); + doScenario(scenario13(units), units, allowEquivalents); + + } + + private static void doScenario(String expression, HashMap units, boolean allowEquivalents) { + System.out.println("-----------------------------------"); + System.out.println("Expression: " + expression); + System.out.println("Units: "); + for(String key : units.keySet()) { + System.out.println(" " + key + " -> " + units.get(key)); + } + StringReader sr = new StringReader(expression); + UnitParser parser = new UnitParser(sr); + try { + UnitCheckingNode node = (UnitCheckingNode) parser.expr(); + + try { + UnitResult u = node.getUnits(units, Function.getAllBuiltInFunctions(), allowEquivalents); + System.out.println("Result: " + u.getCleanFullUnit()); + } catch (UnitCheckingException e) { + e.printStackTrace(); + } + +// node.dump(""); + } catch (ParseException e) { + e.printStackTrace(); + } + } + + private static String scenario1(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "m"); + units.put("c", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("a*b*c"); + return sb.toString(); + } + + private static String scenario2(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "m"); + units.put("c", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("a+b+c"); + return sb.toString(); + } + + private static String scenario3(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "m"); + units.put("c", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("a/b+b/c"); + return sb.toString(); + } + + private static String scenario4(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "m"); + units.put("c", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("if a == b then a+b else b + c + a"); + return sb.toString(); + } + + private static String scenario5(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "s"); + units.put("c", "m"); + units.put("d", "s"); + + StringBuilder sb = new StringBuilder(); +// sb.append("a / b + (c*a)/(b*a)"); + sb.append("c/(b*a)"); + + return sb.toString(); + } + + private static String scenario6(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "s"); + units.put("c", "m"); + units.put("d", "m/s"); + + StringBuilder sb = new StringBuilder(); + sb.append("if a > c then c*a/b else a*d"); + return sb.toString(); + } + + private static String scenario7(HashMap units) { + units.clear(); + + units.put("a", "m/s"); + units.put("b.e", "s"); + units.put("c", "m"); + units.put("d", "s"); + + StringBuilder sb = new StringBuilder(); + sb.append("a[1] + c[1] / b.e[1]"); + return sb.toString(); + } + + private static String scenario8(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "s"); + units.put("c", "s*m"); + + StringBuilder sb = new StringBuilder(); + sb.append("c + {a[i] * b[i] for i in 1:3}"); + return sb.toString(); + } + + private static String scenario9(HashMap units) { + units.clear(); + units.put("a", "m"); + units.put("b", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("1+a+1+b"); + return sb.toString(); + } + + private static String scenario10(HashMap units) { + units.clear(); + units.put("a", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("1*a*1*a"); + return sb.toString(); + } + + private static String scenario11(HashMap units) { + units.clear(); + units.put("a", "m"); + units.put("b", "m"); + + StringBuilder sb = new StringBuilder(); + sb.append("-a+b"); + return sb.toString(); + } + + private static String scenario12(HashMap units) { + units.clear(); + units.put("a", "m"); + units.put("b", "s"); + units.put("c", "m/s"); + + + StringBuilder sb = new StringBuilder(); + sb.append("1/a/b + 1/c"); + return sb.toString(); + } + + private static String scenario13(HashMap units) { + units.clear(); + + units.put("a", "m"); + units.put("b", "m"); + units.put("c", "m"); + units.put("d", "s"); + + StringBuilder sb = new StringBuilder(); + sb.append("(a/b+b/c)/d"); + return sb.toString(); + } + +} + + diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java new file mode 100644 index 00000000..4b57b97d --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ActiveDatasetsIndexVariable.java @@ -0,0 +1,56 @@ +package org.simantics.sysdyn.adapter; + +import java.util.ArrayList; +import java.util.Collection; + +import org.simantics.db.ReadGraph; +import org.simantics.db.WriteGraph; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.modelica.data.DataSet; +import org.simantics.sysdyn.manager.SysdynDataSet; +import org.simantics.sysdyn.manager.SysdynResult; + +public class ActiveDatasetsIndexVariable extends IndexVariable< ArrayList> { + + public ActiveDatasetsIndexVariable(ReadGraph graph, Variable parent, String indexes) + throws DatabaseException { + super(graph, parent, indexes); + } + + @Override + public ArrayList getValue() { + ArrayList datasets = new ArrayList(); + + if(experiment == null) + return datasets; + + Collection results = experiment.getActiveResults(); + ArrayList variableNamesWithIndexes = getVariableNamesWithIndexNumbers(); + ArrayList variableNames = getVariableNames(); + + for(int i = 0; i < variableNamesWithIndexes.size(); i++) { + for(SysdynResult result : results) { + SysdynDataSet ds = result.getDataSet(variableNamesWithIndexes.get(i)); + if(ds != null) { + // NOTE: this method was changed to no longer remove + // remove enumeration indices from variable names as it + // seems unnecessary and makes different instances of the + // same variable with different enumeration indices + // indistinguishable from each other in simulation results + ds.name = variableNames.get(i); + + datasets.add(ds); + } + } + } + return datasets; + } + + @Override + public void setIndexedValue(WriteGraph graph, Object value) + throws DatabaseException { + + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/CustomMigrationStep.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/CustomMigrationStep.java new file mode 100644 index 00000000..dce49fa4 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/CustomMigrationStep.java @@ -0,0 +1,58 @@ +package org.simantics.sysdyn.adapter; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.simantics.db.Resource; +import org.simantics.db.Session; +import org.simantics.db.WriteGraph; +import org.simantics.db.common.request.ObjectsWithType; +import org.simantics.db.common.request.WriteRequest; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.migration.MigrationState; +import org.simantics.db.layer0.migration.MigrationStateKeys; +import org.simantics.db.layer0.migration.MigrationStep; +import org.simantics.db.layer0.util.Layer0Utils; +import org.simantics.layer0.Layer0; +import org.simantics.layer0.utils.direct.GraphUtils; +import org.simantics.simulation.ontology.SimulationResource; +import org.simantics.spreadsheet.resource.SpreadsheetResource; + +public class CustomMigrationStep implements MigrationStep { + + @Override + public void applyTo(IProgressMonitor monitor, Session session, MigrationState state) throws DatabaseException { + + final Resource res = state.getProperty(MigrationStateKeys.CURRENT_RESOURCE); + + session.syncRequest(new WriteRequest() { + + @Override + public void perform(WriteGraph graph) throws DatabaseException { + + Layer0 l0 = Layer0.getInstance(graph); + SimulationResource SIMU = SimulationResource.getInstance(graph); + + for(Resource model : graph.syncRequest(new ObjectsWithType(res, l0.ConsistsOf, SIMU.Model))) { + + Resource sheetExperiment = Layer0Utils.getPossibleChild(graph, model, "SheetExperiment"); + if(sheetExperiment != null) return; + + SpreadsheetResource SHEET = SpreadsheetResource.getInstance(graph); + sheetExperiment = GraphUtils.create2(graph, SHEET.Experiment, + l0.HasName, "SheetExperiment", + l0.HasLabel, "Sheet Experiment", + l0.PartOf, model); + + Resource sheetRun = GraphUtils.create2(graph, SHEET.Run, + l0.HasName, "Default", + l0.PartOf, sheetExperiment); + + + } + + } + + }); + + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java new file mode 100644 index 00000000..0b03a5b4 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java @@ -0,0 +1,272 @@ +package org.simantics.sysdyn.adapter; + +import java.util.ArrayList; +import java.util.HashMap; + +import org.simantics.Simantics; +import org.simantics.databoard.Bindings; +import org.simantics.databoard.binding.Binding; +import org.simantics.databoard.type.Datatype; +import org.simantics.db.ReadGraph; +import org.simantics.db.Resource; +import org.simantics.db.WriteGraph; +import org.simantics.db.common.request.ParametrizedPrimitiveRead; +import org.simantics.db.common.utils.NameUtils; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.AbstractPropertyVariable; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.db.layer0.variable.Variables; +import org.simantics.db.procedure.Listener; +import org.simantics.db.request.ExternalRead; +import org.simantics.modeling.ModelingResources; +import org.simantics.project.IProject; +import org.simantics.simulation.experiment.IExperiment; +import org.simantics.simulation.ontology.SimulationResource; +import org.simantics.simulation.project.IExperimentManager; +import org.simantics.sysdyn.manager.SysdynExperiment; +import org.simantics.sysdyn.manager.SysdynModel; +import org.simantics.sysdyn.manager.SysdynModelManager; +import org.simantics.sysdyn.manager.VariableSubscriptionManager; +import org.simantics.utils.datastructures.Pair; + +public abstract class IndexVariable extends AbstractPropertyVariable { + + protected Variable parent; + protected SysdynModel model; + protected SysdynExperiment experiment; + protected String rvi; + protected HashMap rvis; + protected String indexes; + protected VariableSubscriptionManager subscriptionManager; + + public IndexVariable(ReadGraph graph, Variable parent, String indexes) throws DatabaseException { + this.parent = parent; + this.indexes = indexes; + } + + + protected VariableSubscriptionManager getSubscriptionManager() { + return this.experiment; + } + + public String getIndexes() { + return this.indexes; + } + + /** + * Register a property subscription + * + * @param request PropertyRequest + * @param procedure + * @return + */ + protected VariableValueSubscription registerSubscription(ExternalRead request, Listener procedure) { + // Other properties are requested from model (they listen to new simulation results) + VariableValueSubscription subscription = new VariableValueSubscription(request, this, procedure); + if(subscriptionManager != null) { + subscriptionManager.addVariableValueSubscription(subscription); + } + subscription.update(); + return subscription; + } + + /** + * Unregisters a subscription + * @param subscription + */ + protected void unregisterSubscription(VariableValueSubscription subscription) { + subscription.setListener(null); + if(subscriptionManager != null) + subscriptionManager.removeVariableValueSubscription(subscription); + } + + + + /** + * Class for supporting requests with different property parameters. Equals-method has been modified + * from ParametrizedPrivimiteRead to check also the property value. + * + * @author Teemu Lempinen + * + */ + class PropertyRequest extends ParametrizedPrimitiveRead { + + + public PropertyRequest(Variable indexVariable) { + super(indexVariable); + } + + VariableValueSubscription subscription; + + @Override + public void register(ReadGraph graph, Listener procedure) { + subscription = registerSubscription(this, procedure); + } + @Override + public void unregistered() { + if(subscription != null) { + unregisterSubscription(subscription); + subscription = null; + } + } + + @SuppressWarnings("unchecked") + @Override + public boolean equals(Object object) { + if(object instanceof IndexVariable.PropertyRequest && super.equals(object)) { + return this.parameter.equals(((PropertyRequest)object).parameter); + } else { + return super.equals(object); + } + } + + } + + @Override + public Resource getPropertyResource(ReadGraph graph) throws DatabaseException { + return null; + } + + @Override + public Resource getContainerResource(ReadGraph graph) throws DatabaseException { + return null; + } + + @Override + public Datatype getDatatype(ReadGraph graph) throws DatabaseException { + return null; + } + + @Override + public Variable getPredicate(ReadGraph graph) throws DatabaseException { + return null; + } + + @SuppressWarnings("unchecked") + @Override + public U getValue(ReadGraph graph) throws DatabaseException { + return (U) getValue(graph, Bindings.DOUBLE); + } + + @SuppressWarnings("unchecked") + @Override + public U getValue(ReadGraph graph, Binding binding) throws DatabaseException { + ensureInformationAvailable(graph); + // Do something before request, e.g. calculate some variables used in the request + beforeRequest(graph); + + return (U) graph.syncRequest(new PropertyRequest(this)); + + } + + protected void beforeRequest(ReadGraph graph) throws DatabaseException { + + } + + protected void ensureInformationAvailable(ReadGraph graph) throws DatabaseException { + SimulationResource SIMU = SimulationResource.getInstance(graph); + ModelingResources MOD = ModelingResources.getInstance(graph); + + if(model == null) { + Resource modelResource = Variables.getModel(graph, parent); + Resource configuration = graph.getPossibleObject(modelResource, SIMU.HasConfiguration); + model = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configuration); + } + + Variable var = parent.getParent(graph); + Resource represents = var.getRepresents(graph); + + Resource activeRun = null; + if(represents != null) { + do { + if(graph.isInstanceOf(represents, SIMU.Run)) { + activeRun = represents; + break; + } + var = var.getParent(graph); + represents = var.getRepresents(graph); + } while(represents != null && !graph.isInstanceOf(represents, MOD.StructuralModel)); + } + + IProject project = Simantics.peekProject(); + if(activeRun != null && project != null) { + IExperimentManager expMan = project.getHint(IExperimentManager.KEY_EXPERIMENT_MANAGER); + IExperiment e = expMan.getExperiment(NameUtils.getSafeName(graph, activeRun)); + if(e instanceof SysdynExperiment) + this.experiment = (SysdynExperiment)e; + } + + this.subscriptionManager = getSubscriptionManager(); + rvi = Variables.getPossibleRVI(graph, this); + if(rvi != null) + rvis = graph.syncRequest(new VariableRVIUtils.GetActiveRVIs(parent.getParent(graph))); //VariableRVIUtils.getActiveRVIs(graph, parent.getParent(graph)); + } + + private Pair,ArrayList> getVariableNameArrays() { + Pair,ArrayList> result = new Pair,ArrayList>(new ArrayList(), new ArrayList()); + if(rvi == null || rvis == null) + return result; + + if(rvi.indexOf('#') > 0) + rvi = rvi.substring(0, rvi.indexOf('#')); + + String test = rvi; + if(indexes != null && !indexes.isEmpty()) { + String regexIndexes = indexes.trim().replaceAll(":", "[a-zA-Z0-9_]*"); // Why was there was ".replace('.', ',')" ? - Removed by Teemu 2.9.2012 + test = rvi + "\\[" + regexIndexes + "\\]"; + } else { + test = rvi + "(\\[.*\\])?"; + } + for(String k : rvis.keySet()) { + String value = rvis.get(k); + if(k.matches(test) || value.matches(test)) { + result.first.add(k.substring(1).replace("/", ".").replace("%20", "_")); + result.second.add(value.substring(1).replace("/", ".").replace("%20", " ")); + } + } + + return result; + + } + + protected ArrayList getVariableNames() { + return getVariableNameArrays().second; + } + + protected ArrayList getVariableNamesWithIndexNumbers() { + return getVariableNameArrays().first; + } + + abstract public T getValue(); + + @Override + public void setValue(WriteGraph graph, Object value, Binding binding) throws DatabaseException { + setValue(graph, value); + } + + @Override + public void setValue(WriteGraph graph, Object value) throws DatabaseException { + ensureInformationAvailable(graph); + setIndexedValue(graph, value); + } + + abstract protected void setIndexedValue(WriteGraph graph, Object value) throws DatabaseException; + + + + @Override + public String getName(ReadGraph graph) throws DatabaseException { + return indexes; + } + + @Override + public Object getSerialized(ReadGraph graph) throws DatabaseException { + return indexes; + } + + @Override + public Variable getParent(ReadGraph graph) throws DatabaseException { + return parent; + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java new file mode 100644 index 00000000..7e32bbad --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/NamesIndexVariable.java @@ -0,0 +1,29 @@ +package org.simantics.sysdyn.adapter; + +import java.util.ArrayList; + +import org.simantics.db.ReadGraph; +import org.simantics.db.WriteGraph; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; + +public class NamesIndexVariable extends IndexVariable { + + public NamesIndexVariable(ReadGraph graph, Variable parent, String indexes) + throws DatabaseException { + super(graph, parent, indexes); + } + + @Override + public String[] getValue() { + ArrayList names = getVariableNames(); + return names.toArray(new String[names.size()]); + } + + @Override + public void setIndexedValue(WriteGraph graph, Object value) + throws DatabaseException { + // TODO Auto-generated method stub + + } +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/SensitivityExperimentParameter.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/SensitivityExperimentParameter.java new file mode 100644 index 00000000..73098986 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/SensitivityExperimentParameter.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright (c) 2013 Association for Decentralized Information Management in + * Industry THTH ry. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Semantum Oy - initial API and implementation + *******************************************************************************/ +package org.simantics.sysdyn.adapter; + +import org.simantics.databoard.Bindings; +import org.simantics.db.ReadGraph; +import org.simantics.db.Resource; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.request.PossibleModel; +import org.simantics.simulation.ontology.SimulationResource; +import org.simantics.sysdyn.SysdynResource; +import org.simantics.sysdyn.adapter.distribution.IDistribution; +import org.simantics.sysdyn.manager.SysdynModel; +import org.simantics.sysdyn.manager.SysdynModelManager; +import org.simantics.sysdyn.representation.Enumeration; +import org.simantics.sysdyn.representation.Variable; +import org.simantics.sysdyn.representation.utils.IndexUtils; +import org.simantics.sysdyn.representation.utils.RepresentationUtils; + +public class SensitivityExperimentParameter { + + private String variableName; + private String[] indexes; + private String fullName; + private IDistribution distribution; + + public SensitivityExperimentParameter(ReadGraph graph, Resource parameter) { + + try { + SysdynResource SR = SysdynResource.getInstance(graph); + Resource distributionResource = graph.getPossibleObject(parameter, SR.SensitivityAnalysisExperiment_Parameter_propabilityDistribution); + distribution = graph.adapt(distributionResource, IDistribution.class); + variableName = graph.getPossibleRelatedValue(parameter, SR.SensitivityAnalysisExperiment_Parameter_variable, Bindings.STRING); + indexes = graph.getPossibleRelatedValue(parameter, SR.SensitivityAnalysisExperiment_Parameter_indexes, Bindings.STRING_ARRAY); + + Resource model = graph.syncRequest(new PossibleModel(parameter)); + SysdynModelManager smm = SysdynModelManager.getInstance(graph.getSession()); + SysdynModel sm = smm.getModel(graph, graph.getPossibleObject(model, SimulationResource.getInstance(graph).HasConfiguration)); + + Variable variable = RepresentationUtils.getVariable(sm.getConfiguration(), variableName); + + if (variable != null) { + if(indexes == null && (variable.getArrayIndexes() != null & variable.getArrayIndexes().size() > 0)) { + indexes = new String[variable.getArrayIndexes().size()]; + + for(int i = 0; i < variable.getArrayIndexes().size(); i++) { + Enumeration e = variable.getArrayIndexes().get(i); + indexes[i] = e.getEnumerationIndexes().get(0).getName(); + } + } + + if(indexes != null) { + StringBuilder sb = new StringBuilder(); + sb.append("["); + for(int i = 0; i < indexes.length; i++) { + if(i > 0) + sb.append(","); + + String index = indexes[i]; + sb.append(index); + } + sb.append("]"); + String result = IndexUtils.rangeToIndexes(variable, sb.toString()); + fullName = variableName + result; + } else { + fullName = variableName; + } + } + } catch (DatabaseException e) { + + } + } + + public String getVariableName() { + return variableName; + } + + public String[] getIndexes() { + return indexes; + } + + public String getFullName() { + return fullName; + } + + public IDistribution getDistribution() { + return distribution; + } + + public String getFullModelicaName() { + if (this.fullName == null) + return null; + return this.fullName.replace(' ', '_'); + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimeIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimeIndexVariable.java new file mode 100644 index 00000000..9a44eacf --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimeIndexVariable.java @@ -0,0 +1,32 @@ +package org.simantics.sysdyn.adapter; + +import org.simantics.db.ReadGraph; +import org.simantics.db.WriteGraph; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.sysdyn.manager.SysdynGameExperimentBase; +import org.simantics.sysdyn.manager.SysdynPlaybackExperiment; + +public class TimeIndexVariable extends IndexVariable { + + public TimeIndexVariable(ReadGraph graph, Variable parent, String indexes) + throws DatabaseException { + super(graph, parent, indexes); + } + + @Override + public Double getValue() { + if(experiment != null && experiment instanceof SysdynPlaybackExperiment) + return ((SysdynPlaybackExperiment)experiment).getTime(); + if(experiment != null && experiment instanceof SysdynGameExperimentBase) + return ((SysdynGameExperimentBase)experiment).getSolver().getTime(); + return null; + } + + @Override + public void setIndexedValue(WriteGraph graph, Object value) + throws DatabaseException { + + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimesIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimesIndexVariable.java new file mode 100644 index 00000000..329e4cd2 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/TimesIndexVariable.java @@ -0,0 +1,52 @@ +package org.simantics.sysdyn.adapter; + +import java.util.ArrayList; +import java.util.Collection; + +import org.simantics.db.ReadGraph; +import org.simantics.db.WriteGraph; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; +import org.simantics.sysdyn.manager.SysdynDataSet; +import org.simantics.sysdyn.manager.SysdynResult; + +public class TimesIndexVariable extends IndexVariable { + + public TimesIndexVariable(ReadGraph graph, Variable parent, String indexes) + throws DatabaseException { + super(graph, parent, indexes); + // TODO Auto-generated constructor stub + } + + @Override + public double[][] getValue() { + if(experiment == null) + return new double[0][0]; + + Collection results = experiment.getActiveResults(); + ArrayList variableNames = getVariableNamesWithIndexNumbers(); + + double[][] result = new double[variableNames.size()][]; + for(int i = 0; i < variableNames.size(); i++) { + for(SysdynResult r : results) { + SysdynDataSet ds = r.getDataSet(variableNames.get(i)); + if(ds != null && ds.times != null) { + result[i] = new double[ds.times.length]; + for(int j = 0; j < ds.times.length; j++) { + result[i][j] = ds.times[j]; + } + break; // Show the first result found. (i.e. do not show history datasets) + } + } + if(result[i] == null) + result[i] = new double[0]; + } + return result; + } + + @Override + public void setIndexedValue(WriteGraph graph, Object value) + throws DatabaseException { + } + +} diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java new file mode 100644 index 00000000..e2ab2e44 --- /dev/null +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java @@ -0,0 +1,42 @@ +package org.simantics.sysdyn.adapter; + +import org.simantics.databoard.Datatypes; +import org.simantics.databoard.type.Datatype; +import org.simantics.db.ReadGraph; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.variable.Variable; + +public class ValueIndexVariable extends ValueIndexVariableBase