Skip to content

Commit

Permalink
finished simulation tests
Browse files Browse the repository at this point in the history
  • Loading branch information
valdiz777 committed Apr 28, 2017
1 parent bce579b commit c642d09
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 113,584 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@

# map files
*.rou.xml
*.net.xml
*.net.xml

# analysis files
*.sca
*.vci
*.vec
*.anf
4 changes: 2 additions & 2 deletions dvcastlayer/simulations/uah.launchd.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!-- debug config -->
<launch>
<copy file="net.net.xml" />
<copy file="uahroutes.rou.xml" />
<copy file="RhoadIsland.net.net.xml" />
<copy file="RhoadIslandroutes50.rou.xml" />
<copy file="uah.sumo.cfg" type="config" />
</launch>

4 changes: 2 additions & 2 deletions dvcastlayer/simulations/uah.sumo.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/sumoConfiguration.xsd">

<input>
<net-file value="net.net.xml"/>
<route-files value="uahroutes.rou.xml"/>
<net-file value="RhoadIsland.net.net.xml"/>
<route-files value="RhoadIslandroutes50.rou.xml"/>
</input>

<time>
Expand Down
6 changes: 3 additions & 3 deletions dyna-dvcastlayer/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="dvcastlayer.org.omnetpp.cdt.omnetppProjectType.1362020044" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
<project id="dyna-dvcastlayer.org.omnetpp.cdt.omnetppProjectType.1362020044" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
Expand All @@ -118,10 +118,10 @@
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="gcc-release">
<resource resourceType="PROJECT" workspacePath="/dvcastlayer"/>
<resource resourceType="PROJECT" workspacePath="/dyna-dvcastlayer"/>
</configuration>
<configuration configurationName="gcc-debug">
<resource resourceType="PROJECT" workspacePath="/dvcastlayer"/>
<resource resourceType="PROJECT" workspacePath="/dyna-dvcastlayer"/>
</configuration>
</storageModule>
</cproject>
4 changes: 2 additions & 2 deletions dyna-dvcastlayer/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# dvcastlayer
# dynamic dvcastlayer
Simulation of an advanced DV-Cast VANET in omnet++ using SUMO and TRACI. The advancement is in the primarily in using dynamic programming for broadcast supression as well as the use of trignometric calculus for neighborhood table construction.

## Dependencies
Expand All @@ -13,7 +13,7 @@ Simulation of an advanced DV-Cast VANET in omnet++ using SUMO and TRACI. The adv
1. Download and setup dependencies
2. Open Omnet++
3. Import and Compile Veins
4. Import and Compile dvcastlayer
4. Import and Compile dyna-dvcastlayer
5. Choose a map through the uah.sumo.cfg and uah.launchd.xml files
6. Configure playground size through omnetpp.ini file
7. Run and enjoy!
9 changes: 0 additions & 9 deletions dyna-dvcastlayer/simulations/General.anf

This file was deleted.

4 changes: 0 additions & 4 deletions dyna-dvcastlayer/simulations/run

This file was deleted.

2 changes: 1 addition & 1 deletion dyna-dvcastlayer/simulations/uah.launchd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- debug config -->
<launch>
<copy file="net.net.xml" />
<copy file="uahroutes.rou.xml" />
<copy file="uahroutes50.rou.xml" />
<copy file="uah.sumo.cfg" type="config" />
</launch>

2 changes: 1 addition & 1 deletion dyna-dvcastlayer/simulations/uah.sumo.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/sumoConfiguration.xsd">

<input>
<net-file value="net.net.xml"/>
<route-files value="uahroutes.rou.xml"/>
<route-files value="uahroutes50.rou.xml"/>
</input>

<time>
Expand Down
2 changes: 1 addition & 1 deletion dyna-dvcastlayer/src/application/Dyna_DVCastLayer.ned
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.car2x.veins.modules.application.ieee80211p.BaseWaveApplLayer;

simple Dyna_DVCastLayer extends BaseWaveApplLayer
{
@class(DVCastLayer);
@class(Dyna_DVCastLayer);
@display("i=block/app2");
bool sendWhileParking = default(false); //send messages when the car is parked
}
6 changes: 3 additions & 3 deletions flooding/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="dvcastlayer.org.omnetpp.cdt.omnetppProjectType.1362020044" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
<project id="flooding.org.omnetpp.cdt.omnetppProjectType.1362020044" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
Expand All @@ -118,10 +118,10 @@
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="gcc-release">
<resource resourceType="PROJECT" workspacePath="/dvcastlayer"/>
<resource resourceType="PROJECT" workspacePath="/flooding"/>
</configuration>
<configuration configurationName="gcc-debug">
<resource resourceType="PROJECT" workspacePath="/dvcastlayer"/>
<resource resourceType="PROJECT" workspacePath="/flooding"/>
</configuration>
</storageModule>
</cproject>
4 changes: 2 additions & 2 deletions flooding/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# dvcastlayer
# flooding
Simulation of an advanced DV-Cast VANET in omnet++ using SUMO and TRACI. The advancement is in the primarily in using dynamic programming for broadcast supression as well as the use of trignometric calculus for neighborhood table construction.

## Dependencies
Expand All @@ -13,7 +13,7 @@ Simulation of an advanced DV-Cast VANET in omnet++ using SUMO and TRACI. The adv
1. Download and setup dependencies
2. Open Omnet++
3. Import and Compile Veins
4. Import and Compile dvcastlayer
4. Import and Compile flooding
5. Choose a map through the uah.sumo.cfg and uah.launchd.xml files
6. Configure playground size through omnetpp.ini file
7. Run and enjoy!
9 changes: 0 additions & 9 deletions flooding/simulations/General.anf

This file was deleted.

Loading

0 comments on commit c642d09

Please sign in to comment.