Merge remote-tracking branch 'origin/develop' into 160-new-generator-type-sequencer

src/evoal/plugins/de.evoal.surrogate.smile/src/main/examples/generator-with-svr-surrogate/01-run-generator.sh

@@ -2,5 +2,5 @@
 
 export EVOAL_HOME=$( cd -- "$(dirname $0)/../../" >/dev/null 2>&1 ; pwd -P )
 
-$SHELL $EVOAL_HOME/bin/evoal-generator.sh . surrogate.generator  -Bsurrogate:configuration-file=training.mll -Bsurrogate:pre-trained=surrogate.pson
+$SHELL $EVOAL_HOME/bin/evoal-pipeline.sh . surrogate.generator  -Bsurrogate:configuration-file=training.mll -Bsurrogate:pre-trained=surrogate.pson
 

src/evoal/plugins/de.evoal.surrogate.smile/src/main/examples/generator-with-svr-surrogate/surrogate.generator

 import "definitions" from de.evoal.core.math;
-import "definitions" from de.evoal.generator.generator;
-import "definitions" from de.evoal.surrogate.generator;
+import "definitions" from de.evoal.'pipeline'.base;
+import "definitions" from de.evoal.'pipeline'.distributions;
+
+import "definitions" from de.evoal.surrogate.'pipeline';
 
 import "data" from surrogate;
 
@@ -15,13 +17,18 @@ module surrogate {
 		 * First, we generate some normally distributed data.
 		 */
 		step {
-			component 'normal-distribution' {
-				'μ' := 0.0;
-				'σ' := 5.12;
-			}		
+			component 'distribution-based-data' {
+				distributions := [
+					'normal-distribution' {
+						'μ' := 0.0;
+						'σ' := 5.12;
+					}					
+				];
+			}
 			
 			writes [data 'x:0'];
 		}
+		
 	    step {
 	        component 'surrogate' {
 	        }