Huge mod. Changed HoHuT (House Human Tracking) to EMoS (Elder Monitor…

…ing System).

.csettings/org.omnetpp.cdt.gnu.config.release.1021697354_cdtBuildSystem

@@ -28,7 +28,7 @@
 				</toolChain>
 			</folderInfo>
 			<sourceEntries>
-				<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/annotations"/>
+				<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="examples/EMoS"/>
 			</sourceEntries>
 		</configuration>
 	</storageModule>

.oppbuildspec

@@ -2,15 +2,15 @@
 <dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power" type="makemake"/>
 <dir makemake-options="-o Mac80211 -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/Mac80211" type="makemake"/>
 <dir makemake-options="-o ieee80211p -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/ieee80211p" type="makemake"/>
-<dir makemake-options="-o multiConnectionManager -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/multiConnectionManager" type="makemake"/>
 <dir makemake-options="-o deviceTestAll -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAll" type="makemake"/>
-<dir makemake-options="--deep -o annotations -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/annotations" type="makemake"/>
+<dir makemake-options="-o multiConnectionManager -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/multiConnectionManager" type="makemake"/>
 <dir makemake-options="-o channelInfo -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/channelInfo" type="makemake"/>
+<dir makemake-options="--deep -o annotations -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/annotations" type="makemake"/>
 <dir makemake-options="-o CSMAMac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/CSMAMac" type="makemake"/>
 <dir makemake-options="-o decider -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/decider" type="makemake"/>
-<dir makemake-options="-o coord -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/coord" type="makemake"/>
-<dir makemake-options="-o bmac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/bmac" type="makemake"/>
 <dir makemake-options="-o blackboard -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/blackboard" type="makemake"/>
+<dir makemake-options="-o bmac -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/bmac" type="makemake"/>
+<dir makemake-options="-o coord -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/coord" type="makemake"/>
 <dir makemake-options="-o basePhyLayer -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/basePhyLayer" type="makemake"/>
 <dir makemake-options="--make-so -o powerTestUtils -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/utils" type="makemake"/>
 <dir makemake-options="-o radioState -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/radioState" type="makemake"/>
@@ -28,17 +28,17 @@
 <dir makemake-options="-o baseNetwork -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/baseNetwork" type="makemake"/>
 <dir makemake-options="--nolink -O out --meta:recurse --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="." type="makemake"/>
 <dir makemake-options="-o WSNRouting -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/WSNRouting" type="makemake"/>
-<dir makemake-options="--deep --make-so -o miximbase -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/base" type="makemake"/>
 <dir makemake-options="-o ieee802154Narrow -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/ieee802154Narrow" type="makemake"/>
+<dir makemake-options="--deep --make-so -o miximbase -O out --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/base" type="makemake"/>
 <dir makemake-options="--deep --make-so -o miximmodules -O out -lmiximbase --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src/modules" type="makemake"/>
 <dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples" type="makemake"/>
-<dir makemake-options="-o traci -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/traci" type="makemake"/>
+<dir makemake-options="--deep -o EMoS -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/EMoS" type="makemake"/>
 <dir makemake-options="-o twoRayInterference -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/twoRayInterference" type="makemake"/>
-<dir makemake-options="--deep -o HoHuT -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/HoHuT" type="makemake"/>
+<dir makemake-options="-o traci -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/traci" type="makemake"/>
 <dir makemake-options="--nolink -O out --meta:recurse --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests" type="makemake"/>
-<dir makemake-options="-o baseMobility -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/baseMobility" type="makemake"/>
 <dir makemake-options="-o nicTest -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/nicTest" type="makemake"/>
+<dir makemake-options="-o baseMobility -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/baseMobility" type="makemake"/>
 <dir makemake-options="-o mapping -O out -u CMDENV -lmiximbase -lmiximmodules -lmiximtestUtils --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/mapping" type="makemake"/>
-<dir makemake-options="-o deviceTestAccts -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAccts" type="makemake"/>
 <dir makemake-options="-o analogueModels -O out -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="examples/analogueModels" type="makemake"/>
+<dir makemake-options="-o deviceTestAccts -O out -u CMDENV -lpowerTestUtils -lmiximbase -lmiximmodules --meta:auto-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="tests/power/deviceTestAccts" type="makemake"/>
 </buildspec>

examples/HoHuT/HoHuT.ned → examples/EMoS/EMoS.ned

@@ -1,16 +1,16 @@
-package org.mixim.examples.HoHuT;
+package org.mixim.examples.EMoS;
 
-import org.mixim.modules.node.HoHuT.Host802154_2400MHz_HoHuT_base;
-import org.mixim.modules.node.HoHuT.Host802154_2400MHz_HoHuT_static;
-import org.mixim.modules.node.HoHuT.Host802154_2400MHz_HoHuT_mobile;
+import org.mixim.modules.node.EMoS.Host802154_2400MHz_EMoS_base;
+import org.mixim.modules.node.EMoS.Host802154_2400MHz_EMoS_static;
+import org.mixim.modules.node.EMoS.Host802154_2400MHz_EMoS_mobile;
 
 import org.mixim.modules.obstacle.ObstacleControl;
 import org.mixim.modules.world.annotations.AnnotationManager;
 import org.mixim.base.connectionManager.ConnectionManager;
 import org.mixim.base.modules.BaseWorldUtility;
 
 
-network HoHuT
+network EMoS
 {
     parameters:
         double playgroundSizeX @unit(m); // x size of the area the nodes are in (in meters)
@@ -43,17 +43,17 @@ network HoHuT
                 playgroundSizeZ = playgroundSizeZ;
             @display("p=30,20;i=misc/globe");
         }
-        staticNode[numHostsStatic]: Host802154_2400MHz_HoHuT_static {
+        staticNode[numHostsStatic]: Host802154_2400MHz_EMoS_static {
             parameters:
                 numHosts = numHostsStatic;
             @display("i=micaz_s;p=12,12.5;b=1,1;is=n");
         }
-        mobileNode[numHostsMobile]: Host802154_2400MHz_HoHuT_mobile {
+        mobileNode[numHostsMobile]: Host802154_2400MHz_EMoS_mobile {
             parameters:
                 numHosts = numHostsMobile;
-            @display("i=device/palm2_s;p=10,12.5;b=0,0;is=n");
+            @display("i=wasp_s;p=10,12.5;b=0,0;is=n");
         }
-        baseStation[numHostsBase]: Host802154_2400MHz_HoHuT_base {
+        baseStation[numHostsBase]: Host802154_2400MHz_EMoS_base {
             parameters:
                 numHosts = numHostsBase;
         	@display("i=device/pc2_s;p=10,12.5;b=0,0;is=n");

examples/HoHuT/omnetpp.ini → examples/EMoS/omnetpp.ini

@@ -1,10 +1,10 @@
 [General]
-network = HoHuT
+network = EMoS
 sim-time-limit = 15 min 
 #sim-time-limit = 191 min # for calibration
 repeat = 1
 ned-path=/home/mnobrega/workspace/mixim/src;/home/mnobrega/workspace/mixim
-tkenv-image-path=/home/mnobrega/workspace/mixim/images/hohut
+tkenv-image-path=/home/mnobrega/workspace/mixim/images/EMoS
 load-libs=/home/mnobrega/workspace/mixim/src/modules/miximmodules /home/mnobrega/workspace/mixim/src/base/miximbase
 
 **.coreDebug = false

examples/EMoS/package.ned

@@ -0,0 +1 @@
+package org.mixim.examples.EMoS;

examples/Makefile

@@ -2,7 +2,7 @@
 # OMNeT++/OMNEST Makefile for mixim
 #
 # This file was generated with the command:
-#  opp_makemake -f --nolink -O out -d Mac80211 -d ieee80211p -d multiConnectionManager -d annotations -d CSMAMac -d bmac -d obstacles -d lmac -d BaseMoBANNetwork -d veins -d ieee802154a -d traci_launchd -d baseNetwork -d WSNRouting -d ieee802154Narrow -d twoRayInterference -d HoHuT -d analogueModels -I/usr/include/libxml2 -L../out/$(CONFIGNAME)/tests/power/utils -L../out/$(CONFIGNAME)/tests/testUtils -L../out/$(CONFIGNAME)/src/base -L../out/$(CONFIGNAME)/src/modules
+#  opp_makemake -f --nolink -O out -d Mac80211 -d ieee80211p -d multiConnectionManager -d annotations -d CSMAMac -d bmac -d obstacles -d lmac -d BaseMoBANNetwork -d veins -d ieee802154a -d traci_launchd -d baseNetwork -d WSNRouting -d ieee802154Narrow -d EMoS -d twoRayInterference -d analogueModels -I/usr/include/libxml2 -L../out/$(CONFIGNAME)/tests/power/utils -L../out/$(CONFIGNAME)/tests/testUtils -L../out/$(CONFIGNAME)/src/base -L../out/$(CONFIGNAME)/src/modules
 #
 
 # C++ include paths (with -I)
@@ -63,9 +63,9 @@ endif
 all: $(OBJS) submakedirs Makefile
 	@# Do nothing
 
-submakedirs:  Mac80211_dir ieee80211p_dir multiConnectionManager_dir annotations_dir CSMAMac_dir bmac_dir obstacles_dir lmac_dir BaseMoBANNetwork_dir veins_dir ieee802154a_dir traci_launchd_dir baseNetwork_dir WSNRouting_dir ieee802154Narrow_dir twoRayInterference_dir HoHuT_dir analogueModels_dir
+submakedirs:  Mac80211_dir ieee80211p_dir multiConnectionManager_dir annotations_dir CSMAMac_dir bmac_dir obstacles_dir lmac_dir BaseMoBANNetwork_dir veins_dir ieee802154a_dir traci_launchd_dir baseNetwork_dir WSNRouting_dir ieee802154Narrow_dir EMoS_dir twoRayInterference_dir analogueModels_dir
 
-.PHONY: all clean cleanall depend msgheaders  Mac80211 ieee80211p multiConnectionManager annotations CSMAMac bmac obstacles lmac BaseMoBANNetwork veins ieee802154a traci_launchd baseNetwork WSNRouting ieee802154Narrow twoRayInterference HoHuT analogueModels
+.PHONY: all clean cleanall depend msgheaders  Mac80211 ieee80211p multiConnectionManager annotations CSMAMac bmac obstacles lmac BaseMoBANNetwork veins ieee802154a traci_launchd baseNetwork WSNRouting ieee802154Narrow EMoS twoRayInterference analogueModels
 Mac80211: Mac80211_dir
 ieee80211p: ieee80211p_dir
 multiConnectionManager: multiConnectionManager_dir
@@ -81,8 +81,8 @@ traci_launchd: traci_launchd_dir
 baseNetwork: baseNetwork_dir
 WSNRouting: WSNRouting_dir
 ieee802154Narrow: ieee802154Narrow_dir
+EMoS: EMoS_dir
 twoRayInterference: twoRayInterference_dir
-HoHuT: HoHuT_dir
 analogueModels: analogueModels_dir
 
 Mac80211_dir:
@@ -130,12 +130,12 @@ WSNRouting_dir:
 ieee802154Narrow_dir:
 	cd ieee802154Narrow && $(MAKE) all
 
+EMoS_dir:
+	cd EMoS && $(MAKE) all
+
 twoRayInterference_dir:
 	cd twoRayInterference && $(MAKE) all
 
-HoHuT_dir:
-	cd HoHuT && $(MAKE) all
-
 analogueModels_dir:
 	cd analogueModels && $(MAKE) all
 
@@ -164,8 +164,8 @@ msgheaders: $(MSGFILES:.msg=_m.h)
 	cd baseNetwork && $(MAKE) msgheaders
 	cd WSNRouting && $(MAKE) msgheaders
 	cd ieee802154Narrow && $(MAKE) msgheaders
+	cd EMoS && $(MAKE) msgheaders
 	cd twoRayInterference && $(MAKE) msgheaders
-	cd HoHuT && $(MAKE) msgheaders
 	cd analogueModels && $(MAKE) msgheaders
 
 clean:
@@ -188,8 +188,8 @@ clean:
 	-cd baseNetwork && $(MAKE) clean
 	-cd WSNRouting && $(MAKE) clean
 	-cd ieee802154Narrow && $(MAKE) clean
+	-cd EMoS && $(MAKE) clean
 	-cd twoRayInterference && $(MAKE) clean
-	-cd HoHuT && $(MAKE) clean
 	-cd analogueModels && $(MAKE) clean
 
 cleanall: clean
@@ -212,8 +212,8 @@ depend:
 	-cd baseNetwork && if [ -f Makefile ]; then $(MAKE) depend; fi
 	-cd WSNRouting && if [ -f Makefile ]; then $(MAKE) depend; fi
 	-cd ieee802154Narrow && if [ -f Makefile ]; then $(MAKE) depend; fi
+	-cd EMoS && if [ -f Makefile ]; then $(MAKE) depend; fi
 	-cd twoRayInterference && if [ -f Makefile ]; then $(MAKE) depend; fi
-	-cd HoHuT && if [ -f Makefile ]; then $(MAKE) depend; fi
 	-cd analogueModels && if [ -f Makefile ]; then $(MAKE) depend; fi
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.

src/base/Makefile

@@ -18,7 +18,7 @@ INCLUDE_PATH = \
     -IphyLayer \
     -Itimers \
     -Iutils \
-    -Iutils/HoHuT
+    -Iutils/EMoS
 
 # Additional object and library files to link with
 EXTRA_OBJS =
@@ -161,13 +161,13 @@ clean:
 	-rm -f phyLayer/*_m.cc phyLayer/*_m.h
 	-rm -f timers/*_m.cc timers/*_m.h
 	-rm -f utils/*_m.cc utils/*_m.h
-	-rm -f utils/HoHuT/*_m.cc utils/HoHuT/*_m.h
+	-rm -f utils/EMoS/*_m.cc utils/EMoS/*_m.h
 
 cleanall: clean
 	-rm -rf $(PROJECT_OUTPUT_DIR)
 
 depend:
-	$(MAKEDEPEND) $(INCLUDE_PATH) -f Makefile -P\$$O/ -- $(MSG_CC_FILES)  ./*.cc connectionManager/*.cc messages/*.cc modules/*.cc phyLayer/*.cc timers/*.cc utils/*.cc utils/HoHuT/*.cc
+	$(MAKEDEPEND) $(INCLUDE_PATH) -f Makefile -P\$$O/ -- $(MSG_CC_FILES)  ./*.cc connectionManager/*.cc messages/*.cc modules/*.cc phyLayer/*.cc timers/*.cc utils/*.cc utils/EMoS/*.cc
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 $O/connectionManager/BaseConnectionManager.o: connectionManager/BaseConnectionManager.cc \