correct logic in Driver and adapt ATOL solution

Author: TheoLeCalvar

models/emptyChange.xmi

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns="Changes">
+</xmi:XMI>

solutions/atol/transformation/src/main/java/atol/example/transformation/Run.xtend

@@ -3,31 +3,38 @@ package atol.example.transformation
 
 import atl.research.AbstractDriver
 import atl.research.class_.Class
+import atl.research.class_.DataType
 import io.github.atlresearch.emfmodelfuzzer.SimpleEMFModelFuzzer
 import org.eclipse.emf.ecore.EObject
 
 
 class Run extends AbstractDriver {
-	val Class2Relational transformation
+	var Class2Relational transformation
 
 	static def void main(String[] args) {
-		new Run()
-    }
+		val solution = new Run()
 
-	new() throws Exception {
-		// call AbstractDriver constructor to initialize source, changes and target
-		super()
+		solution.init
+        solution.applyTransformation
+        solution.applyChange
+        solution.saveTarget
+    }
 
+	new() {
 		// initialize transformation
-        transformation = new Class2Relational()
+        this.transformation = new Class2Relational()
 
 		// other initialization code
 	}
 
 	override void applyTransformation() {
 		for(EObject e : source.contents) {
 			if(e instanceof Class) {
-				val res = transformation.Class2Table(e)._out
+				val res = this.transformation.Class2Table(e)._out
+				target.contents.add(res)
+			}
+			else if (e instanceof DataType) {
+				val res = this.transformation.DataType2Type(e)._out
 				target.contents.add(res)
 			}
 		}

utils/SolutionDriver/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'application'
     id 'java-library'
     id 'maven-publish'
 }
@@ -10,10 +11,14 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.eclipse.emf:org.eclipse.emf.ecore:2.33.0'
-    implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.18.0"
+    implementation 'org.eclipse.emf:org.eclipse.emf.ecore:+'
+    implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:+"
 }
 
+application {
+    // Define the main class for the application.
+    mainClass = 'atl.research.ExampleSolution'
+}
 
 publishing {
     publications {

utils/SolutionDriver/src/main/java/atl/research/AbstractDriver.java

@@ -20,37 +20,7 @@ public abstract class AbstractDriver {
     Resource target;
     Resource changes;
 
-    public AbstractDriver() throws Exception {
-        // setup EMF resource set to load models
-        setupResourceSet();
 
-        // loading & creating models
-        if (System.getenv("SOURCE_PATH") == null) {
-            throw new Exception("SOURCE_PATH environment variable not set");
-        }
-        else if (System.getenv("CHANGE_PATH") == null) {
-            throw new Exception("CHANGE_PATH environment variable not set");
-        }
-        else if (System.getenv("TARGET_PATH") == null) {
-            throw new Exception("TARGET_PATH environment variable not set");
-        }
-
-        source = loadModel(System.getenv("SOURCE_PATH"));
-        changes = loadModel(System.getenv("CHANGES_PATH"));
-        target = createModel(System.getenv("TARGET_PATH"));
-
-        // apply transformation
-        applyTransformation();
-
-        // apply changes
-        applyChange();
-
-        // save target model
-        saveTarget();
-    }
-
-    
-    
 
     public Resource getSource() {
         return source;
@@ -62,8 +32,12 @@ public Resource getTarget() {
         return target;
     }
 
-
-    void setupResourceSet() {
+    public void init() throws Exception {
+        setupResourceSet();
+        loadModels();
+    }
+    
+    protected void setupResourceSet() {
         resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(
             "xmi",
             new XMIResourceFactoryImpl()
@@ -82,23 +56,40 @@ void setupResourceSet() {
         );
     }
 
-    Resource loadModel(String modelPath) {
-        return resourceSet.getResource(URI.createFileURI(modelPath), false);
+    protected void loadModels() throws Exception {
+        if (System.getenv("SOURCE_PATH") == null) {
+            throw new Exception("SOURCE_PATH environment variable not set");
+        }
+        else if (System.getenv("CHANGE_PATH") == null) {
+            throw new Exception("CHANGE_PATH environment variable not set");
+        }
+        else if (System.getenv("TARGET_PATH") == null) {
+            throw new Exception("TARGET_PATH environment variable not set");
+        }
+
+        source = loadModel(System.getenv("SOURCE_PATH"));
+        changes = loadModel(System.getenv("CHANGE_PATH"));
+        target = createModel(System.getenv("TARGET_PATH"));
+    }
+
+    private Resource loadModel(String modelPath) {
+        System.out.println("Loading model from " + modelPath);
+        return resourceSet.getResource(URI.createFileURI(modelPath), true);
     }
 
-    Resource createModel(String modelPath) {
+    private Resource createModel(String modelPath) {
         return resourceSet.createResource(URI.createFileURI(modelPath));
     }
 
-    void applyChange() {
+    protected void applyChange() {
         // we ignore change models that are empty (for checking correctness)
         if (changes.getContents().size() > 0) {
             ModelChange change = (ModelChange) changes.getContents().get(0);
             change.apply();
         }
     }
 
-    void saveTarget() throws IOException {
+    protected void saveTarget() throws IOException {
         target.save(Collections.emptyMap());
     }
 

utils/SolutionDriver/src/main/java/atl/research/ExampleSolution.java

@@ -0,0 +1,21 @@
+package atl.research;
+
+import org.eclipse.emf.ecore.EObject;
+
+public class ExampleSolution extends AbstractDriver {
+    public static void main(String[] args) throws Exception {
+        ExampleSolution solution = new ExampleSolution();
+
+        solution.init();
+        solution.applyTransformation();
+        solution.applyChange();
+        solution.saveTarget();
+    }
+
+    @Override
+    protected void applyTransformation() {
+        for (EObject e : this.getSource().getContents()) {
+            System.out.println(e);
+        }
+    }
+}