Simulation update

d3scomp · Jan 30, 2014 · 95615be · 95615be
1 parent a1287db
commit 95615be
Show file tree

Hide file tree

Showing 7 changed files with 292 additions and 240 deletions.
diff --git a/jdeeco-simulation-demo/.classpath b/jdeeco-simulation-demo/.classpath
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk7-32"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.simulation"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/test-classes" path="test">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<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.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jdeeco-simulation-demo/libintegration.dll b/jdeeco-simulation-demo/libintegration.dll
diff --git a/jdeeco-simulation-demo/libmodel.dll b/jdeeco-simulation-demo/libmodel.dll
diff --git a/jdeeco-simulation-demo/omnetpp.ini b/jdeeco-simulation-demo/omnetpp.ini
@@ -1,10 +1,10 @@
 [General]
 cmdenv-express-mode = true
 network = manet.MANET
-sim-time-limit = 72000s
+sim-time-limit = 10s
 
 load-libs = model oppcmdenv
-ned-path = model;D:/Workspaces/OMNeT++/Workspace/MiXiM/examples;D:/Workspaces/OMNeT++/Workspace/MiXiM/src/base;D:/Workspaces/OMNeT++/Workspace/MiXiM/src/inet_stub;D:/Workspaces/OMNeT++/Workspace/MiXiM/src/modules 
+ned-path = model;mixim/examples;mixim/src/base;mixim/src/inet_stub;mixim/src/modules 
 
 **.drawMaxIntfDist = true
 ##########################################################
@@ -70,6 +70,7 @@ ned-path = model;D:/Workspaces/OMNeT++/Workspace/MiXiM/examples;D:/Workspaces/OM
 #**.node[0].mobility.initialX = 150m
 #**.node[0].mobility.initialY = 200m
 #**.node[0].mobility.initialZ = 250m
+#**.node[0].appl.id = NodeID
 
 **.numNodes = 8
 

diff --git a/jdeeco-simulation-demo/omnetpp.ini.templ b/jdeeco-simulation-demo/omnetpp.ini.templ
@@ -1,7 +1,7 @@
 [General]
 cmdenv-express-mode = true
 network = manet.MANET
-sim-time-limit = 720000s
+sim-time-limit = 10s
 
 load-libs = model oppcmdenv
 ned-path = model;mixim/examples;mixim/src/base;mixim/src/inet_stub;mixim/src/modules