Brutal commit of windows adaptations

moclodash-evaluation/evaluation-scripts/generate-all

@@ -2,15 +2,19 @@
 
 DIR=`dirname $0`
 
-BENCHTOOL="$DIR/../fr.inria.diverse.cloning.benchmark.tool.product/target/products/fr.inria.diverse.cloning.benchmark.tool.product/linux/gtk/x86_64/cloning-benchmark"
-MMGENERATOR="$BENCHTOOL mmgen"
-MATERIALGENERATOR="$BENCHTOOL matgen"
+############### Must point to the folder of the evaluation tool
+BENCHTOOLDIR="$DIR/../x86_64/"
+###############
 
+BENCHTOOL="$BENCHTOOLDIR/cloning-benchmark"
+MMGENERATOR="$BENCHTOOL mmgen nopause"
+MATERIALGENERATOR="$BENCHTOOL matgen nopause"
 OUTPUTFOLDER=./benchmarktool-workingdir
 
-
-for i in {1..10}
+# We generate 10 bundles, each with 10 metamodels
+# We have to proceed this way because unfortunately some memory leak issue forbids us to generate a bundle with 100 metamodels in a single row
+for i in `seq 1 1 $1`
 do
-    $MMGENERATOR --maxClasses 50  --maxProp 250 --maxMutProp 50 --nbMetamodels 10 --outputFolder=$OUTPUTFOLDER/$i
+    $MMGENERATOR --maxClasses 5  --maxProp 250 --maxMutProp 50 --nbMetamodels 10 --outputFolder=$OUTPUTFOLDER/$i
     $MATERIALGENERATOR  --metamodelsFolder=$OUTPUTFOLDER/$i --outputFile=$OUTPUTFOLDER/bundle$i.jar # --outputProjectFolder=./$i/generated-project    
 done

moclodash-evaluation/evaluation-scripts/plot-all

-#!/bin/bash
-
-RARGS=""
-for i in "$@"
-do
-    RARGS="$RARGS $i"
-done
-
-R --no-save --args $RARGS < ./process-data.R
-
-ls *.pdf | xargs -I '{}' pdfcrop '{}' '{}'
-
-mv *.pdf benchmarktool-workingdir
+#!/bin/bash
+
+RARGS=""
+for i in "$@"
+do
+    RARGS="$RARGS $i"
+done
+
+R --no-save --args $RARGS < ./process-data.R
+
+ls *.pdf | xargs -I '{}' pdfcrop '{}' '{}'
+
+mv *.pdf benchmarktool-workingdir

moclodash-evaluation/evaluation-scripts/run-all

-#!/bin/bash
-
-DIR=`dirname $0`
-
-BENCHTOOLDIR="$DIR/../fr.inria.diverse.cloning.benchmark.tool.product/target/products/fr.inria.diverse.cloning.benchmark.tool.product/linux/gtk/x86_64/"
-BENCHTOOL="$BENCHTOOLDIR/cloning-benchmark"
-TOOL="$BENCHTOOL run"
-
-OUTPUTFOLDER=./benchmarktool-workingdir
-
-# Parsing arguments
-BUNDLES=""
-for arg in "$@"
-do
-    BUNDLES="$BUNDLES$arg,"
-done
-
-# To reset registered OSGi bundles
-rm -rf "$BENCHTOOLDIR/configuration/org.eclipse.osgi"
-
-$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 1 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal1.csv --dumpsFolder=/tmp2/cloningDumpsAll
-#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 10 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal10.csv --dumpsFolder=/tmp2/cloningDumpsAll
-#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 100 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal100.csv --dumpsFolder=/tmp2/cloningDumpsAll
-$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 1000 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal1000.csv --dumpsFolder=/tmp2/cloningDumpsAll --keepDumps
-#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 10000 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal10000.csv --dumpsFolder=/tmp2/cloningDumpsAll
+#!/bin/bash
+
+DIR=`dirname $0`
+
+############### Must point to the folder of the evaluation tool
+BENCHTOOLDIR="$DIR/../x86_64/"
+###############
+
+BENCHTOOL="$BENCHTOOLDIR/cloning-benchmark"
+TOOL="$BENCHTOOL run nopause"
+OUTPUTFOLDER=./benchmarktool-workingdir
+
+# Parsing arguments (osgi bundles) in order to generate an argument for the evaluation tool
+BUNDLES=""
+for arg in "$@"
+do
+    BUNDLES="$BUNDLES$arg,"
+done
+
+# To reset registered OSGi bundles
+rm -rf "$BENCHTOOLDIR/configuration/org.eclipse.osgi"
+
+$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 1 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal1.csv --dumpsFolder=/tmp2/cloningDumpsAll
+#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 10 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal10.csv --dumpsFolder=/tmp2/cloningDumpsAll
+#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 100 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal100.csv --dumpsFolder=/tmp2/cloningDumpsAll
+$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 1000 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal1000.csv --dumpsFolder=/tmp2/cloningDumpsAll
+#$TOOL --benchmarkMetamodels=$BUNDLES --nbClones 10000 --nbtries 5 --outputFile $OUTPUTFOLDER/resultsFinal10000.csv --dumpsFolder=/tmp2/cloningDumpsAll

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.gitignore

-/bin
+/bin

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.project

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>fr.inria.diverse.cloning.benchmark.materialgenerator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fr.inria.diverse.cloning.benchmark.materialgenerator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.settings/org.eclipse.core.resources.prefs

-eclipse.preferences.version=1
-encoding//testdata/shareAttributes.ecore=UTF-8
-encoding//testdata/shareAttributes.ecorediag=UTF-8
-encoding//testdata/simple1.ecore=UTF-8
-encoding//testdata/simple1.ecorediag=UTF-8
-encoding//testdata/simple2.ecore=UTF-8
-encoding//testdata/simple2.ecorediag=UTF-8
-encoding//testdata/welldesigned.ecore=UTF-8
-encoding//testdata/welldesigned.ecorediag=UTF-8
-encoding//testdata/welldesigned2roots.ecorediag=UTF-8
+eclipse.preferences.version=1
+encoding//testdata/shareAttributes.ecore=UTF-8
+encoding//testdata/shareAttributes.ecorediag=UTF-8
+encoding//testdata/simple1.ecore=UTF-8
+encoding//testdata/simple1.ecorediag=UTF-8
+encoding//testdata/simple2.ecore=UTF-8
+encoding//testdata/simple2.ecorediag=UTF-8
+encoding//testdata/welldesigned.ecore=UTF-8
+encoding//testdata/welldesigned.ecorediag=UTF-8
+encoding//testdata/welldesigned2roots.ecorediag=UTF-8

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.settings/org.eclipse.jdt.core.prefs

-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/.settings/org.eclipse.m2e.core.prefs

-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: BenchmarkGenerator
-Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.materialgenerator;singleton:=true
-Bundle-Version: 0.1.0.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.core.resources;bundle-version="3.8.101",
- org.eclipse.emf.codegen.ecore;bundle-version="2.9.1",
- org.eclipse.emf.ecore.xmi;bundle-version="2.9.1",
- org.eclipse.jdt.core;bundle-version="3.9.1",
- fr.inria.diverse.cloning.runtime;bundle-version="0.1.0",
- fr.inria.diverse.cloning.materialgenerator;bundle-version="0.1.0",
- fr.inria.diverse.cloning.benchmark.common;bundle-version="0.1.0",
- fr.inria.diverse.cloning.external-libs;bundle-version="0.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: fr.inria.diverse.cloning.benchmark.materialgenerator.generator,
- fr.inria.diverse.cloning.benchmark.materialgenerator.main
-Bundle-ClassPath: .
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: BenchmarkGenerator
+Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.materialgenerator;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
+ org.eclipse.core.resources;bundle-version="3.8.101",
+ org.eclipse.emf.codegen.ecore;bundle-version="2.9.1",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.1",
+ org.eclipse.jdt.core;bundle-version="3.9.1",
+ fr.inria.diverse.cloning.runtime;bundle-version="0.1.0",
+ fr.inria.diverse.cloning.materialgenerator;bundle-version="0.1.0",
+ fr.inria.diverse.cloning.benchmark.common;bundle-version="0.1.0",
+ fr.inria.diverse.cloning.external-libs;bundle-version="0.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: fr.inria.diverse.cloning.benchmark.materialgenerator.generator,
+ fr.inria.diverse.cloning.benchmark.materialgenerator.main
+Bundle-ClassPath: .

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/build.properties

-source.. = src/
-output.. = target/classes
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .
-jars.compile.order = .
+source.. = src/
+output.. = target/classes
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .
+jars.compile.order = .

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/plugin.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="fr.inria.diverse.cloning.benchmark.materialgenerator.main.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="fr.inria.diverse.cloning.benchmark.materialgenerator.application"
-            name="fr.inria.diverse.cloning.benchmark.materialgenerator">
-         <property
-               name="appName"
-               value="fr.inria.diverse.cloning.benchmark.materialgenerator">
-         </property>
-      </product>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="application"
+         point="org.eclipse.core.runtime.applications">
+      <application>
+         <run
+               class="fr.inria.diverse.cloning.benchmark.materialgenerator.main.Application">
+         </run>
+      </application>
+   </extension>
+   <extension
+         id="product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="fr.inria.diverse.cloning.benchmark.materialgenerator.application"
+            name="fr.inria.diverse.cloning.benchmark.materialgenerator">
+         <property
+               name="appName"
+               value="fr.inria.diverse.cloning.benchmark.materialgenerator">
+         </property>
+      </product>
+   </extension>
+
+</plugin>

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2014 Université de Rennes 1.
-  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:
-      Erwan Bousse - initial API and implementation
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>fr.inria.diverse.cloning.benchmark</groupId>
-  <artifactId>fr.inria.diverse.cloning.benchmark.materialgenerator</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>moclodash-evaluation</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Université de Rennes 1.
+  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:
+      Erwan Bousse - initial API and implementation
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>fr.inria.diverse.cloning.benchmark</groupId>
+  <artifactId>fr.inria.diverse.cloning.benchmark.materialgenerator</artifactId>
+  <version>0.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  
+   <parent>
+    <groupId>fr.inria.diverse.cloning</groupId>
+    <artifactId>moclodash-evaluation</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+  </parent>
+  
+  
+</project>

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/target/.gitignore

-/classes

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/testdata/simple1.ecore

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2014 Université de Rennes 1.
-  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:
-      Erwan Bousse - initial API and implementation
--->
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="simple1" nsURI="http://simple1/1.0" nsPrefix="simple1">
-  <eClassifiers xsi:type="ecore:EClass" name="A">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="b" eType="#//B" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x_m" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="B"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Université de Rennes 1.
+  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:
+      Erwan Bousse - initial API and implementation
+-->
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="simple1" nsURI="http://simple1/1.0" nsPrefix="simple1">
+  <eClassifiers xsi:type="ecore:EClass" name="A">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="b" eType="#//B" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x_m" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="B"/>
+</ecore:EPackage>

moclodash-evaluation/fr.inria.diverse.cloning.benchmark.materialgenerator/testdata/simple1.ecorediag

-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_xMiCMInOEeOfEZ4B4N-TPg" type="EcoreTools" name="simple1" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_xo0VkInOEeOfEZ4B4N-TPg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_xo08oInOEeOfEZ4B4N-TPg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xo08oYnOEeOfEZ4B4N-TPg" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_2Eq0kIzpEeOzGbakj0L1yw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="simple1.ecore#//A/x_m"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2Eq0kYzpEeOzGbakj0L1yw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_3sXLIIzpEeOzGbakj0L1yw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="simple1.ecore#//A/y"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3sXyMIzpEeOzGbakj0L1yw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xo08oonOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xo08o4nOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xo08pInOEeOfEZ4B4N-TPg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xo08pYnOEeOfEZ4B4N-TPg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xo08ponOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xo08p4nOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xo08qInOEeOfEZ4B4N-TPg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xo0VkYnOEeOfEZ4B4N-TPg" fontColor="4210752" fontName="Cantarell" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="simple1.ecore#//A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xo0VkonOEeOfEZ4B4N-TPg" x="389" y="103"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_yDp3cInOEeOfEZ4B4N-TPg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_yDqegInOEeOfEZ4B4N-TPg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_yDqegYnOEeOfEZ4B4N-TPg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_yDqegonOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_yDqeg4nOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yDqehInOEeOfEZ4B4N-TPg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_yDrFkInOEeOfEZ4B4N-TPg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_yDrFkYnOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_yDrFkonOEeOfEZ4B4N-TPg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yDrFk4nOEeOfEZ4B4N-TPg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_yDp3cYnOEeOfEZ4B4N-TPg" fontColor="4210752" fontName="Cantarell" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="simple1.ecore#//B"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDp3conOEeOfEZ4B4N-TPg" x="390" y="230"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_xMiCMYnOEeOfEZ4B4N-TPg"/>
-  <element xmi:type="ecore:EPackage" href="simple1.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_yp4xAInOEeOfEZ4B4N-TPg" type="3002" source="_xo0VkInOEeOfEZ4B4N-TPg" target="_yDp3cInOEeOfEZ4B4N-TPg">
-    <children xmi:type="notation:Node" xmi:id="_yp5YEInOEeOfEZ4B4N-TPg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yp5YEYnOEeOfEZ4B4N-TPg" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_yp5YEonOEeOfEZ4B4N-TPg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_yp5YE4nOEeOfEZ4B4N-TPg" x="-8" y="18"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_yp4xAYnOEeOfEZ4B4N-TPg" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_yp4xAonOEeOfEZ4B4N-TPg" fontColor="4210752" fontName="Cantarell" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="simple1.ecore#//A/b"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yp4xA4nOEeOfEZ4B4N-TPg" points="[-4, 22, 29, -106]$[17, 120, 50, -8]"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_xMiCMInOEeOfEZ4B4N-TPg" type="EcoreTools" name="simple1" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_xo0VkInOEeOfEZ4B4N-TPg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_xo08oInOEeOfEZ4B4N-TPg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_xo08oYnOEeOfEZ4B4N-TPg" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_2Eq0kIzpEeOzGbakj0L1yw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="simple1.ecore#//A/x_m"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2Eq0kYzpEeOzGbakj0L1yw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_3sXLIIzpEeOzGbakj0L1yw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="simple1.ecore#//A/y"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3sXyMIzpEeOzGbakj0L1yw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xo08oonOEeOfEZ4B4N-TPg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xo08o4nOEeOfEZ4B4N-TPg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xo08pInOEeOfEZ4B4N-TPg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xo08pYnOEeOfEZ4B4N-TPg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_xo08ponOEeOfEZ4B4N-TPg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_xo08p4nOEeOfEZ4B4N-TPg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xo08qInOEeOfEZ4B4N-TPg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_xo0VkYnOEeOfEZ4B4N-TPg" fontColor="4210752" fontName="Cantarell" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="simple1.ecore#//A"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xo0VkonOEeOfEZ4B4N-TPg" x="389" y="103"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_yDp3cInOEeOfEZ4B4N-TPg" type="1001">