page Modellierung 2014 added
diff --git a/_projectCommon.php b/_projectCommon.php
index c36004c..e16d114 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -18,6 +18,7 @@
$Nav->addCustomNav("Publications", "publications.php", "_self", 2);
$Nav->addCustomNav("MoDELS 2013", "models2013.php", "_self", 2);
$Nav->addCustomNav("FASE 2014", "fase2014.php", "_self", 2);
+ $Nav->addCustomNav("MoK 2014", "moK2014.php", "_self", 2);
# $Nav->addCustomNav("FAQ", "faq.php", "_self", 2);
diff --git a/moK2014.php b/moK2014.php
new file mode 100644
index 0000000..1d40905
--- /dev/null
+++ b/moK2014.php
@@ -0,0 +1,70 @@
+<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
+
+ $pageTitle = "Modellierungskonferenz 2014 - Submission 40";
+ $pageKeywords = "EMF, Refactor, model refactoring, refactoring";
+ $pageAuthor = "Thorsten Arendt";
+
+ $html = <<<EOHTML
+
+<div id="maincontent">
+
+ <div id="midcolumn">
+ <h1>$pageTitle</h1>
+ This area is dedicated to the research paper <b><i>Comparing Model-Driven and Custom Development
+ Approaches for Optimizing the Energy Consumption of ITC-Systems in the Cloud</i></b>
+ submitted to the conference <b><a href="http://www.modellierung2014.org/home.html" target="_blank">
+ Modellierung 2014</a></b>. It contains various material concerning the installation and evaluation of
+ the approach respectively its prototype implementation.
+ <br/><br/>
+
+ <p>
+ <h2>Installation Guide</h2>
+ <!-- ol class="midlist">
+ <li>Please download the <b><i>Juno Eclipse Modeling Tools</i></b> from <a href="http://www.eclipse.org/downloads/packages/release/juno/sr2" target="_blank">
+ http://www.eclipse.org/downloads/packages/release/juno/sr2</a></li>. Unzip and start Eclipse and update the system (<i>Help > Check for Updates</i>).</li>
+ <li>Restart Eclipse and install the EMF model transformation language <b><i>Henshin</i></b> (<i>Help > Install New Software... >
+ Work with: <a href="http://download.eclipse.org/modeling/emft/henshin/updates/release" target="_blank">http://download.eclipse.org/modeling/emft/henshin/updates/release</a> > next > ...</i>).</li>
+ <li>Restart Eclipse and install the prototype implementation (branch of <b><i>EMF Refactor</i></b>):
+ <i>Help > Install New Software... > Work with:
+ <a href="http://download.eclipse.org/emf-refactor/updatesite-fase2014" target="_blank">
+ http://download.eclipse.org/emf-refactor/updatesite-fase2014</a> > next > ...</i>.</li>
+ <li>Restart Eclipse.</li>
+ </ol -->
+ <p>
+ <h2>Projects</h2>
+ <!-- ul class="midlist">
+ <li><a href="downloads/fase2014_projects.zip" target="_blank">fase2014_projects</a></li>
+ </ul>
+ For evaluation purposes please download <b>fase2014_projects.zip</b> from above and import
+ the example projects <b>pdfsam_code</b>, <b>pdfsam_model</b>, and <b>VehicleRentalCompany</b>
+ into your workspace (<i>File > Import... > General > Existing Projects into Workspace > Next
+ > Select archive file > Browse (to the zip file) > Select all > Finish</i>).
+ <br/><br/ -->
+
+ <h2>Test results</h2>
+ The following pages summarize the results oof our tests concerning the correctness of both implementations:
+ <br/><br/>
+ <ol class="midlist">
+ <li>Test case 01: <a href="mok2014/Test01_Substitute_ClientNode/Results.html">Substitute Client Node</a></li>
+ </ol>
+
+ </div>
+
+ <div id="rightcolumn">
+ <div class="sideitem">
+ <h6>Incubation</h6>
+ <p>This component is currently in its <a href="http://www.eclipse.org/projects/dev_process/validation-phase.php">Validation (Incubation) Phase</a>.</p>
+ <div align="center"><a href="/projects/what-is-incubation.php"><img align="center" src="/images/egg-incubation.png" border="0" alt="Incubation" /></a></div>
+ </div>
+
+ </div>
+
+</div>
+
+
+EOHTML;
+
+
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/mok2014/Test01_Substitute_ClientNode/Results.html b/mok2014/Test01_Substitute_ClientNode/Results.html
new file mode 100644
index 0000000..0a9834c
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/Results.html
@@ -0,0 +1,20 @@
+<html>
+</body>
+<hr>
+<h1>Test01_Substitute_ClientNode</h1>
+<hr>
+<h2>Instance Model</h2><br>
+<img src="model.png"><br><hr>
+<h2>Metrics (custom solution)</h2><br>
+<img src="metrics_custom.png"><br><hr>
+<h2>Metrics (EMF Refactor solution)</h2><br>
+<img src="metrics_refactor.png"><br><hr>
+<h2>Smells (EMF Refactor solution)</h2><br>
+<img src="smells_refactor.png"><br><hr>
+<h2>Optimization Rule (custom solution)</h2><br>
+<img src="ruleset.png"><br><hr>
+<h2>Optimization Log (EMF Refactor solution)</h2><br>
+<img src="log.png"><br>
+<hr>
+<body>
+</html>
\ No newline at end of file
diff --git a/mok2014/Test01_Substitute_ClientNode/Rule01.pam b/mok2014/Test01_Substitute_ClientNode/Rule01.pam
new file mode 100644
index 0000000..a1e0b09
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/Rule01.pam
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PAM:Room xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:PAM="PAM" Name="Diagram">
+ <contains xsi:type="PAM:ClientNode" Name="CELSIUS W410" Max_Watt="49" MFLOPs="47"/>
+ <contains xsi:type="PAM:ClientNode" Name="CELSIUS W410" Max_Watt="51" MFLOPs="58"/>
+ <contains xsi:type="PAM:ClientNode" Name="CELSIUS W280" Max_Watt="58" MFLOPs="39"/>
+</PAM:Room>
diff --git a/mok2014/Test01_Substitute_ClientNode/Rule01.pam_diagram b/mok2014/Test01_Substitute_ClientNode/Rule01.pam_diagram
new file mode 100644
index 0000000..45540dd
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/Rule01.pam_diagram
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:PAM="PAM" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_W9cNYcsuEeGoh-HVdaZg6w" type="PAM" measurementUnit="Pixel">
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_W9cNYssuEeGoh-HVdaZg6w"/>
+ <element xmi:type="PAM:Room" href="Rule01.pam#/"/>
+</notation:Diagram>
diff --git a/mok2014/Test01_Substitute_ClientNode/log.PNG b/mok2014/Test01_Substitute_ClientNode/log.PNG
new file mode 100644
index 0000000..e13e8ad
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/log.PNG
Binary files differ
diff --git a/mok2014/Test01_Substitute_ClientNode/metrics_custom.PNG b/mok2014/Test01_Substitute_ClientNode/metrics_custom.PNG
new file mode 100644
index 0000000..8b9fd9f
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/metrics_custom.PNG
Binary files differ
diff --git a/mok2014/Test01_Substitute_ClientNode/metrics_refactor.PNG b/mok2014/Test01_Substitute_ClientNode/metrics_refactor.PNG
new file mode 100644
index 0000000..fc28362
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/metrics_refactor.PNG
Binary files differ
diff --git a/mok2014/Test01_Substitute_ClientNode/model.png b/mok2014/Test01_Substitute_ClientNode/model.png
new file mode 100644
index 0000000..27bb264
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/model.png
Binary files differ
diff --git a/mok2014/Test01_Substitute_ClientNode/ruleset.henshin b/mok2014/Test01_Substitute_ClientNode/ruleset.henshin
new file mode 100644
index 0000000..ee32a2a
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/ruleset.henshin
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<henshin:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmi:id="PAM_Transformation_System">
+ <imports href="PAM#/"/>
+ <units xsi:type="henshin:Rule" xmi:id="Rule_ClientNode_Substitution0" name="SubsituteClientNode2">
+ <lhs xmi:id="Rule_ClientNode_Substitution_LHS0" name="LHS">
+ <nodes xmi:id="Rule_ClientNode_Substitution_LHS_ClientNode0">
+ <type href="PAM#//ClientNode"/>
+ <attributes xmi:id="Rule_ClientNode_Substitution_LHS_ClientNode0_Name" value=""CELSIUS W280"">
+ <type href="PAM#//Nodes/Name"/>
+ </attributes>
+ <attributes xmi:id="Rule_ClientNode_Substitution_LHS_ClientNode0_Max_Watt" value="58">
+ <type href="PAM#//Nodes/Max_Watt"/>
+ </attributes>
+ <attributes xmi:id="Rule_ClientNode_Substitution_LHS_ClientNode0_MFLOPS" value="39">
+ <type href="PAM#//ClientNode/MFLOPs"/>
+ </attributes>
+ </nodes>
+ </lhs>
+ <rhs xmi:id="Rule_ClientNode_Substitution_RHS0" name="RHS">
+ <nodes xmi:id="Rule_ClientNode_Substitution_RHS_ClientNode0">
+ <type href="PAM#//ClientNode"/>
+ <attributes xmi:id="Rule_ClientNode_Substitution_RHS_ClientNode0_Name" value=""CELSIUS W410"">
+ <type href="PAM#//Nodes/Name"/>
+ </attributes>
+ <attributes xmi:id="Rule_ClientNode_Substitution_RHS_ClientNode0_Max_Watt" value="49">
+ <type href="PAM#//Nodes/Max_Watt"/>
+ </attributes>
+ <attributes xmi:id="Rule_ClientNode_Substitution_RHS_ClientNode0_MFLOPS" value="47">
+ <type href="PAM#//ClientNode/MFLOPs"/>
+ </attributes>
+ </nodes>
+ </rhs>
+ <mappings xmi:id="Rule_ClientNode_Substitution_Mapping_ClientNode0" origin="Rule_ClientNode_Substitution_LHS_ClientNode0" image="Rule_ClientNode_Substitution_RHS_ClientNode0"/>
+ </units>
+</henshin:Module>
diff --git a/mok2014/Test01_Substitute_ClientNode/ruleset.henshin_diagram b/mok2014/Test01_Substitute_ClientNode/ruleset.henshin_diagram
new file mode 100644
index 0000000..bac7eea
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/ruleset.henshin_diagram
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_EH8qwEI7EeOYf-jR6jTYBQ" type="Henshin" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_EKclIEI7EeOYf-jR6jTYBQ" type="2001" fontName="Segoe UI" italic="true" fillColor="16114135" lineColor="0">
+ <children xmi:type="notation:DecorationNode" xmi:id="_EKdMMEI7EeOYf-jR6jTYBQ" type="5001"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_EKdMMUI7EeOYf-jR6jTYBQ" type="7001">
+ <children xmi:type="notation:Shape" xmi:id="_EKeaUEI7EeOYf-jR6jTYBQ" type="3001" fontName="Segoe UI">
+ <children xmi:type="notation:DecorationNode" xmi:id="_EKeaUkI7EeOYf-jR6jTYBQ" type="5002"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_EKeaU0I7EeOYf-jR6jTYBQ" type="5003"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_EKeaVEI7EeOYf-jR6jTYBQ" type="7002">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_EKeaVUI7EeOYf-jR6jTYBQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_EKeaVkI7EeOYf-jR6jTYBQ"/>
+ </children>
+ <element xmi:type="henshin:Node" href="ruleset.henshin#Rule_ClientNode_Substitution_LHS_ClientNode0"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EKeaUUI7EeOYf-jR6jTYBQ" x="32" y="24"/>
+ </children>
+ </children>
+ <element xmi:type="henshin:Rule" href="ruleset.henshin#Rule_ClientNode_Substitution0"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EKclIUI7EeOYf-jR6jTYBQ" x="54" y="32" width="382"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_EH8qwUI7EeOYf-jR6jTYBQ"/>
+ <element xmi:type="henshin:Module" href="ruleset.henshin#PAM_Transformation_System"/>
+</notation:Diagram>
diff --git a/mok2014/Test01_Substitute_ClientNode/ruleset.png b/mok2014/Test01_Substitute_ClientNode/ruleset.png
new file mode 100644
index 0000000..0ec57bc
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/ruleset.png
Binary files differ
diff --git a/mok2014/Test01_Substitute_ClientNode/smells_refactor.PNG b/mok2014/Test01_Substitute_ClientNode/smells_refactor.PNG
new file mode 100644
index 0000000..db6f22b
--- /dev/null
+++ b/mok2014/Test01_Substitute_ClientNode/smells_refactor.PNG
Binary files differ
