Commit ebb31d40 authored by Alexander David Hellwig's avatar Alexander David Hellwig

Merge branch 'ClusteringVersion' into 'master'

Update Clustring version + use Karger's algorithm strategy in Monte Carlo evaluation

See merge request !36
parents 79943a28 3a37662d
Pipeline #149535 passed with stages
in 29 minutes and 32 seconds
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-middleware-generator</artifactId> <artifactId>embedded-montiarc-math-middleware-generator</artifactId>
<version>0.0.22-SNAPSHOT</version> <version>0.0.23-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<Embedded-montiarc-math-roscpp-generator.version>0.1.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version> <Embedded-montiarc-math-roscpp-generator.version>0.1.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<EMADL2CPP.version>0.2.8</EMADL2CPP.version> <EMADL2CPP.version>0.2.8</EMADL2CPP.version>
<EMADL.version>0.2.7-SNAPSHOT</EMADL.version> <EMADL.version>0.2.7-SNAPSHOT</EMADL.version>
<embedded-montiarc-component-clustering.version>0.0.1-SNAPSHOT</embedded-montiarc-component-clustering.version> <embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
......
...@@ -3,6 +3,7 @@ package de.monticore.lang.monticar.generator.middleware; ...@@ -3,6 +3,7 @@ package de.monticore.lang.monticar.generator.middleware;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol;
import de.monticore.lang.monticar.clustering.FlattenArchitecture; import de.monticore.lang.monticar.clustering.FlattenArchitecture;
import de.monticore.lang.monticar.clustering.Simulation.MonteCarloIntegration; import de.monticore.lang.monticar.clustering.Simulation.MonteCarloIntegration;
import de.monticore.lang.monticar.clustering.Simulation.MonteCarloKargerStrategy;
import de.monticore.lang.monticar.clustering.Simulation.MonteCarloResult; import de.monticore.lang.monticar.clustering.Simulation.MonteCarloResult;
import de.monticore.lang.monticar.generator.middleware.cli.DistributedTargetGeneratorCli; import de.monticore.lang.monticar.generator.middleware.cli.DistributedTargetGeneratorCli;
import de.monticore.lang.tagging._symboltable.TaggingResolver; import de.monticore.lang.tagging._symboltable.TaggingResolver;
...@@ -96,6 +97,7 @@ public class EvaluationTest { ...@@ -96,6 +97,7 @@ public class EvaluationTest {
//Random Clustering //Random Clustering
System.out.println("Starting Simulation"); System.out.println("Starting Simulation");
MonteCarloIntegration sim = new MonteCarloIntegration(iterations, 3); MonteCarloIntegration sim = new MonteCarloIntegration(iterations, 3);
sim.setClusteringDelegate(new MonteCarloKargerStrategy());
sim.simulate(flattenedComponent); sim.simulate(flattenedComponent);
MonteCarloResult res = new MonteCarloResult(componentInstanceSymbol, sim); MonteCarloResult res = new MonteCarloResult(componentInstanceSymbol, sim);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment