Merge branch 'feature/path_tagging' of...

Merge branch 'feature/path_tagging' of /home/abdallah/Documents/SLE_Poject/EMADL2CPP with conflicts.

pom.xml

@@ -15,7 +15,7 @@
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-    <emadl.version>0.2.6</emadl.version>
+    <emadl.version>0.2.7-SNAPSHOT</emadl.version>
     <CNNTrain.version>0.2.6</CNNTrain.version>
     <cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version>
     <cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version>
@@ -62,6 +62,12 @@
 
         <!-- MontiCore Dependencies -->
 
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>common-monticar</artifactId>
+            <version>0.0.17-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-opt-generator</artifactId>

src/test/resources/models/tagging/AlexNet.tag

 package tagging;
 conforms to dltag.DataPathTagSchema;
 
-tags Alexnet {
-tag Alexnet with DataPath = {path = src/test/resources/models, type = LMDB};
-tag AlexnetInvalid with DataPath = {path = test/resources/models, type = random};
-tag AlexnetInvalidType with DataPath = {path = src/test/resources/models, type = LMBD};
-tag Parent.a1 with DataPath = {path = instanceA1, type = random};
-}
-
-
-
+tags AlexNet {
+tag Alexnet with DataPath = {path = dataAlexnetComponent, type = random};
+tag Parent.a1 with DataPath = {path = dataParent, type = random};
+}
\ No newline at end of file

src/test/resources/models/tagging/Parent.emadl

 package tagging;
 
-component Parent{
-    instance Alexnet a1;
-    instance Alexnet a2;
+component Parent {
+    instance tagging.Alexnet a1;
 }
\ No newline at end of file