Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Kit committed Jun 16, 2014
2 parents 5e2a7dc + e10da24 commit e43660f
Show file tree
Hide file tree
Showing 61 changed files with 3,776 additions and 331 deletions.
6 changes: 3 additions & 3 deletions jdeeco-core/model/RuntimeModel.ecore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="ensembleControllers" upperBound="-1"
eType="#//EnsembleController" containment="true" eOpposite="#//EnsembleController/componentInstance"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="internalData" upperBound="-1"
eType="#//StringToObjectMap" containment="true"/>
eType="#//ObjectToObjectMap" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EnsembleDefinition">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
Expand Down Expand Up @@ -96,8 +96,8 @@
<eClassifiers xsi:type="ecore:EClass" name="PathNodeCoordinator" eSuperTypes="#//PathNode"/>
<eClassifiers xsi:type="ecore:EClass" name="PathNodeMember" eSuperTypes="#//PathNode"/>
<eClassifiers xsi:type="ecore:EClass" name="PathNodeComponentId" eSuperTypes="#//PathNode"/>
<eClassifiers xsi:type="ecore:EClass" name="StringToObjectMap" instanceClassName="java.util.Map$Entry">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eClassifiers xsi:type="ecore:EClass" name="ObjectToObjectMap" instanceClassName="java.util.Map$Entry">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EDataType" name="CommunicationBoundary" instanceClassName="cz.cuni.mff.d3s.deeco.network.CommunicationBoundaryPredicate"/>
Expand Down
6 changes: 3 additions & 3 deletions jdeeco-core/model/RuntimeModel.ecorediag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,11 @@
<children xmi:type="notation:Node" xmi:id="__hyVw4j4EeOfLpLK1dkgcw" type="4001"/>
<children xmi:type="notation:Node" xmi:id="__hyVxIj4EeOfLpLK1dkgcw" type="5001">
<children xmi:type="notation:Node" xmi:id="_Ib4i8Ij5EeOfLpLK1dkgcw" type="2001">
<element xmi:type="ecore:EAttribute" href="RuntimeModel.ecore#//StringToObjectMap/key"/>
<element xmi:type="ecore:EAttribute" href="RuntimeModel.ecore#//ObjectToObjectMap/key"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Ib4i8Yj5EeOfLpLK1dkgcw"/>
</children>
<children xmi:type="notation:Node" xmi:id="_Pgmi4Ij5EeOfLpLK1dkgcw" type="2001">
<element xmi:type="ecore:EAttribute" href="RuntimeModel.ecore#//StringToObjectMap/value"/>
<element xmi:type="ecore:EAttribute" href="RuntimeModel.ecore#//ObjectToObjectMap/value"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Pgmi4Yj5EeOfLpLK1dkgcw"/>
</children>
<styles xmi:type="notation:DrawerStyle" xmi:id="__hyVxYj4EeOfLpLK1dkgcw"/>
Expand All @@ -421,7 +421,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="__hy804j4EeOfLpLK1dkgcw"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="__hyVwYj4EeOfLpLK1dkgcw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
<element xmi:type="ecore:EClass" href="RuntimeModel.ecore#//StringToObjectMap"/>
<element xmi:type="ecore:EClass" href="RuntimeModel.ecore#//ObjectToObjectMap"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="__hyVwoj4EeOfLpLK1dkgcw" x="36" y="924"/>
</children>
<children xmi:type="notation:Node" xmi:id="_CZsq8I3DEeOR39rlF2jaxw" type="1004">
Expand Down
17 changes: 13 additions & 4 deletions jdeeco-core/model/RuntimeModel.genmodel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
</genEnums>
<genDataTypes ecoreDataType="RuntimeModel.ecore#//Method"/>
<genDataTypes ecoreDataType="RuntimeModel.ecore#//KnowledgeManager"/>
<genDataTypes ecoreDataType="RuntimeModel.ecore#//KnowledgeManagersView"/>
<genClasses ecoreClass="RuntimeModel.ecore#//PeriodicTrigger">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//PeriodicTrigger/period"/>
<genDataTypes ecoreDataType="RuntimeModel.ecore#//ShadowKnowledgeManagerRegistry"/>
<genDataTypes ecoreDataType="RuntimeModel.ecore#//CommunicationBoundary"/>
<genClasses ecoreClass="RuntimeModel.ecore#//TimeTrigger">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//TimeTrigger/period"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//TimeTrigger/offset"/>
</genClasses>
<genClasses image="false" ecoreClass="RuntimeModel.ecore#//Trigger"/>
<genClasses ecoreClass="RuntimeModel.ecore#//KnowledgeChangeTrigger">
Expand All @@ -42,14 +44,16 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//ComponentInstance/componentProcesses"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ComponentInstance/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ComponentInstance/knowledgeManager"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ComponentInstance/otherKnowledgeManagersAccess"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ComponentInstance/shadowKnowledgeManagerRegistry"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//ComponentInstance/ensembleControllers"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//ComponentInstance/internalData"/>
</genClasses>
<genClasses ecoreClass="RuntimeModel.ecore#//EnsembleDefinition">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//EnsembleDefinition/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//EnsembleDefinition/membership"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//EnsembleDefinition/knowledgeExchange"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//EnsembleDefinition/triggers"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//EnsembleDefinition/communicationBoundary"/>
</genClasses>
<genClasses ecoreClass="RuntimeModel.ecore#//Condition"/>
<genClasses ecoreClass="RuntimeModel.ecore#//Exchange"/>
Expand All @@ -62,6 +66,7 @@
<genClasses ecoreClass="RuntimeModel.ecore#//Parameter">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//Parameter/direction"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//Parameter/knowledgePath"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//Parameter/type"/>
</genClasses>
<genClasses ecoreClass="RuntimeModel.ecore#//Invocable">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeModel.ecore#//Invocable/parameters"/>
Expand All @@ -74,5 +79,9 @@
<genClasses ecoreClass="RuntimeModel.ecore#//PathNodeCoordinator"/>
<genClasses ecoreClass="RuntimeModel.ecore#//PathNodeMember"/>
<genClasses ecoreClass="RuntimeModel.ecore#//PathNodeComponentId"/>
<genClasses ecoreClass="RuntimeModel.ecore#//ObjectToObjectMap">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ObjectToObjectMap/key"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute RuntimeModel.ecore#//ObjectToObjectMap/value"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
4 changes: 2 additions & 2 deletions jdeeco-core/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated RuntimeModel -->
<package
uri="http://runtimemodel/1.0"
class="cz.cuni.mff.d3s.deeco.model.runtime.meta.runtimePackage"
uri="http://cz.cuni.mff.d3s.deeco.model.runtime/1.0"
class="cz.cuni.mff.d3s.deeco.model.runtime.meta.RuntimeMetadataPackage"
genModel="model/RuntimeModel.genmodel"/>
</extension>

Expand Down
91 changes: 0 additions & 91 deletions jdeeco-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
<artifactId>cz.cuni.mff.d3s.jdeeco.core</artifactId>
<packaging>jar</packaging>
<properties>
<dist>../dist</dist>
<coreJar>jdeeco.jar</coreJar>
<lib>${dist}/lib</lib>
<clonerJar>cloner.jar</clonerJar>
<objenesisJar>objenesis.jar</objenesisJar>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
Expand All @@ -35,92 +29,7 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy</id>
<phase>install</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
<destFileName>${coreJar}</destFileName>
<outputDirectory>${dist}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<phase>install</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${dist}</outputDirectory>
<includeScope>compile</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>clean-dist</id>
<goals>
<goal>clean</goal>
</goals>
<phase>clean</phase>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!-- Ignore/Execute plugin execution -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<!-- copy-dependency plugin -->
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange>
<goals>
<goal>unpack</goal>
<goal>
copy-dependencies
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public class Host implements CurrentTimeProvider, NetworkInterface {
private final NetworkProvider networkProvider;
private final CurrentTimeProvider timeProvider;


protected Host(NetworkProvider networkProvider, CurrentTimeProvider timeProvider, String jDEECoAppModuleId, boolean hasMANETNic, boolean hasIPNic) {
this.networkProvider = networkProvider;
this.timeProvider = timeProvider;
Expand Down
8 changes: 0 additions & 8 deletions jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
View file

This file was deleted.

89 changes: 44 additions & 45 deletions jdeeco-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,14 @@
<packaging>pom</packaging>
<groupId>cz.cuni.mff.d3s.jdeeco</groupId>
<properties>
<dist>../dist</dist>
<jdeecoCoreSrc>../jdeeco-core/src</jdeecoCoreSrc>
<mode>default</mode>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<mode>default</mode>
</properties>
<modules>
<module>../jdeeco-core</module>
<module>../jdeeco-demo</module>
<module>../jdeeco-core-osgi</module>
<module>../jdeeco-simulation</module>
<module>../jdeeco-simulation-demo</module>
</modules>
</profile>
</profiles>
<modules>
<module>../jdeeco-core</module>
<!-- <module>../jdeeco-demo</module> <module>../jdeeco-core-osgi</module> -->
<module>../jdeeco-simulation</module>
<!-- <module>../jdeeco-simulation-demo</module> -->
</modules>
<build>
<plugins>
<plugin>
Expand All @@ -38,33 +24,46 @@
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>clean-dist</id>
<goals>
<goal>clean</goal>
</goals>
<phase>clean</phase>
<configuration>
<filesets>
<fileset>
<directory>${dist}</directory>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!-- Ignore/Execute plugin execution -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<!-- copy-dependency plugin -->
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange>
<goals>
<goal>unpack</goal>
<goal>
copy-dependencies
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>
<repositories>
<repository>
<id>sonatype.releases</id>
<url>http://oss.sonatype.org/content/repositories/releases/</url>
</repository>
<id>sonatype.releases</id>
<url>http://oss.sonatype.org/content/repositories/releases/</url>
</repository>
</repositories>
</project>
9 changes: 6 additions & 3 deletions jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessor;
import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessorException;
import cz.cuni.mff.d3s.deeco.logging.Log;
import cz.cuni.mff.d3s.deeco.model.runtime.api.ComponentInstance;
import cz.cuni.mff.d3s.deeco.model.runtime.api.RuntimeMetadata;
import cz.cuni.mff.d3s.deeco.model.runtime.custom.RuntimeMetadataFactoryExt;
import cz.cuni.mff.d3s.deeco.network.DirectGossipStrategy;
Expand All @@ -30,8 +31,8 @@
import cz.cuni.mff.d3s.deeco.network.PublisherTask;
import cz.cuni.mff.d3s.deeco.runtime.RuntimeFramework;
import cz.cuni.mff.d3s.deeco.simulation.SimulationHost;
import cz.cuni.mff.d3s.deeco.simulation.SimulationRuntimeBuilder;
import cz.cuni.mff.d3s.deeco.simulation.omnet.OMNetSimulation;
import cz.cuni.mff.d3s.deeco.simulation.omnet.OMNetSimulationRuntimeBuilder;

/**
* Main class for launching the CBSE evaluation demo.
Expand Down Expand Up @@ -65,7 +66,7 @@ public static void main(String[] args) throws AnnotationProcessorException, IOEx
OMNetSimulation sim = new OMNetSimulation();

AnnotationProcessor processor = new AnnotationProcessor(RuntimeMetadataFactoryExt.eINSTANCE);
OMNetSimulationRuntimeBuilder builder = new OMNetSimulationRuntimeBuilder();
SimulationRuntimeBuilder builder = new SimulationRuntimeBuilder();

SiteConfigParser siteParser = new SiteConfigParser(siteCfg);
Position topRight = siteParser.parseTopRightCorner();
Expand Down Expand Up @@ -143,7 +144,9 @@ public Collection<String> filterRecipients(
AreaNetworkRegistry.INSTANCE.addComponent(component);

// there is only one component instance
model.getComponentInstances().get(0).getInternalData().put(PositionAwareComponent.HOST_REFERENCE, host);
for (ComponentInstance ci: model.getComponentInstances()) {
PositionAwareComponent.initialize(ci, new PositionSensor(host, sim));
}
Collection<DirectRecipientSelector> recipientSelectors = null;
if (component.hasIP) {
recipientSelectors = Arrays.asList((DirectRecipientSelector) directRecipientSelector);
Expand Down
4 changes: 1 addition & 3 deletions jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Member.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
import java.util.Map;
import java.util.Random;

import cz.cuni.mff.d3s.deeco.DeecoProperties;
import cz.cuni.mff.d3s.deeco.annotations.In;
import cz.cuni.mff.d3s.deeco.annotations.Out;
import cz.cuni.mff.d3s.deeco.annotations.PeriodicScheduling;
import cz.cuni.mff.d3s.deeco.annotations.Process;
import cz.cuni.mff.d3s.deeco.annotations.Component;
import cz.cuni.mff.d3s.deeco.logging.Log;
import cz.cuni.mff.d3s.deeco.network.PublisherTask;
import cz.cuni.mff.d3s.deeco.task.ParamHolder;
import cz.cuni.mff.d3s.deeco.task.ProcessContext;

Expand Down Expand Up @@ -55,7 +53,7 @@ public Member(String id, String team_id, Position position, boolean hasIP) {
@PeriodicScheduling(500)
public static void measureMemberData(@In("id") String id,
@Out("memberData") ParamHolder<MemberData> memberData) {
Map<String, Object> internal = ProcessContext.getCurrentProcess().getComponentInstance().getInternalData().map();
Map<Object, Object> internal = ProcessContext.getCurrentProcess().getComponentInstance().getInternalData().map();
if (!internal.containsKey(DANGER_TIME)) {
long seed = 0;
for (char c: id.toCharArray())
Expand Down
Loading

0 comments on commit e43660f

Please sign in to comment.