akeranen · mbruns42 · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017
diff --git a/.gitattributes b/.gitattributes
@@ -13,6 +13,8 @@
 
 # Windows batch files should retain CRLF
 *.bat           text eol=crlf
+# Bash scripts should have LF (Unix-Style line endings)
+*.sh            text eol=lf
 
 *.class         binary
 *.gif           binary

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,11 @@ doc/package-list
 .project
 /target/
 .settings/org.eclipse.*
+.idea/
+.gradle/
+build/
+target/
+lib/Simulator.jar
+
+/bin/
+out/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,101 @@
+image: openjdk:8-jdk
+
+# Make the gradle wrapper executable. This essentially downloads a copy of
+# Gradle to build the project with.
+# https://docs.gradle.org/current/userguide/gradle_wrapper.html
+# It is expected that any modern gradle project has a wrapper
+before_script:
+    - chmod +x gradlew
+
+# We redirect the gradle user home using -g so that it caches the
+# wrapper and dependencies.
+# https://docs.gradle.org/current/userguide/gradle_command_line.html
+#
+# Unfortunately it also caches the build output so
+# cleaning removes reminants of any cached builds.
+# The assemble task actually builds the project.
+# If it fails here, the tests can't run.
+stages:
+  - analyze
+  - build
+  - test
+
+sonarqube:
+  stage: analyze
+  only:
+    - master
+  variables:
+    GIT_STRATEGY: clone
+  script:
+    - ./gradlew clean test jacoco sonarqube -Dsonar.login=cd4b5ee1fc6a8dfe089c350184fdd715d6cfb28b -Dsonar.projectVersion=$CI_BUILD_REF
+  tags:
+    - shared
+
+sonarqube_manual:
+  stage: analyze
+  except:
+    - master
+  when: manual
+  variables:
+    GIT_STRATEGY: clone
+  script:
+    - ./gradlew clean test jacoco sonarqube -Dsonar.login=cd4b5ee1fc6a8dfe089c350184fdd715d6cfb28b -Dsonar.branch=$CI_BUILD_REF_NAME -Dsonar.projectVersion=$CI_BUILD_REF -Dsonar.profile=ANDI_Simulator
+  tags:
+    - shared
+
+sonarqube_preview:
+  stage: analyze
+  variables:
+    GIT_STRATEGY: clone
+  script:
+    - ./gradlew sonarqube -Dsonar.analysis.mode=preview -Dsonar.login=cd4b5ee1fc6a8dfe089c350184fdd715d6cfb28b -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.issuesReport.console.enable=true -Dsonar.gitlab.commit_sha=$CI_BUILD_REF -Dsonar.gitlab.ref=$CI_BUILD_REF_NAME -x test
+  allow_failure: true
+  tags:
+    - shared
+
+build:
+  stage: build
+  script:
+    - ./gradlew -g /cache/.gradle clean assemble copyGui
+  artifacts:
+    paths:
+    - lib/
+    - target/
+    - data/
+    - ee/
+    - example_settings/
+    - toolkit/
+    - wdm_settings/
+    - one.bat
+    - one.sh
+    - LICENSE.txt
+    - README.md
+    - README.txt
+    - default_settings.txt
+    - CONTRIBUTING.md
+    - HISTORY.txt
+
+  allow_failure: false
+  tags:
+    - shared
+
+# Use the generated build output to run the tests.
+test:
+  stage: test
+  script:
+    - ./gradlew -g /cache/.gradle check jacoco
+  artifacts:
+    when: always
+    paths:
+    - build/reports/
+  tags:
+    - shared
+
+perl_test:
+  stage: test
+  image: perl:5.24.1
+  before_script:
+    - cpan IPC::System::Simple
+  script: prove -v toolkit/tests
+  tags:
+    - shared
diff --git a/allocsimulation.sh b/allocsimulation.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#parameters for the allocation of the job on OCuLUS
+#CCS --island OCULUS
+#CCS -N pgandiSim
+#CCS --res=rset=1:ncpus=2:mem=128g
+#CCS -t 21d
+#CCS -m abe
+#CCS --output=out.txt
+#CCS --stderr=err.txt
+
+#the simulation task
+./one.sh -b 1 configurations/evaluation/settingsScenarioRealistic.txt
+#archive the reports and console output. Only executed successfully, if the simulation run completes
+#with enough time left for this to be executed.
+nice -n 15 tar -czf "result$(date '+%d%m%Y_%H%M%S').tar.gz" out.txt err.txt reports
+#remove reports and logged console output. Only executed successfully, if the simulation run completes
+#with enough time left for this to be executed.
+rm reports/* out.txt err.txt
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,80 @@
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        jcenter()
+    }
+    dependencies {
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1"
+     }
+}
+
+plugins {
+    id "org.sonarqube" version "2.2.1"
+}
+
+apply plugin: 'java'
+apply plugin: 'jacoco'
+apply plugin: "org.sonarqube"
+
+
+repositories {
+    jcenter()
+	flatDir {
+        dirs 'lib'
+	}
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ["src/applications", "src/core", "src/gui", "src/input", "src/interfaces", "src/main", "src/movement", "src/report", "src/routing", "src/ui", "src/util"]
+        }
+        output.resourcesDir = 'target'
+        output.classesDir   = 'target'
+    }
+    test {
+        java {
+            srcDirs = ["src/test"]
+        }
+    }
+}
+
+jar {
+    destinationDir = new File('lib')
+    manifest {
+        attributes 'Main-Class': 'core.DTNSim'
+        attributes 'Class-Path': "ECLA.jar DTNConsoleConnection.jar ../target"
+    }
+}
+
+dependencies {
+    // The production code uses Guava
+    compile 'com.google.guava:guava:20.0'
+
+    //JSON framework
+    compile group: 'org.glassfish', name: 'javax.json', version: '1.0.4'
+
+    // Use JUnit test framework
+    testCompile 'junit:junit:4.12'
+    testCompile "org.mockito:mockito-core:2.+"
+
+	compile name: 'DTNConsoleConnection'
+
+	compile name: 'ECLA'
+}
+
+test {
+    //make gradle run tests one after the other to prevent tests with static variables from influencing each other
+    forkEvery=1
+}
+
+task copyGui(type: Copy){
+    from 'src/gui/buttonGraphics'
+    into 'target/gui/buttonGraphics'
+}
+
+clean.doFirst{
+    delete 'target'
+}
diff --git a/compile.sh b/compile.sh
@@ -1,8 +1,9 @@
+#!/bin/sh
 targetdir=target
 
-if [ ! -d "$targetdir" ]; then mkdir $targetdir; fi
+if [ ! -d "$targetdir" ]; then mkdir -p $targetdir; fi
 
 javac -sourcepath src -d $targetdir -extdirs lib/ src/core/*.java src/movement/*.java src/report/*.java src/routing/*.java src/gui/*.java src/input/*.java src/applications/*.java src/interfaces/*.java
 
-if [ ! -d "$targetdir/gui/buttonGraphics" ]; then cp -R src/gui/buttonGraphics target/gui/; fi
+if [ ! -d "$targetdir/gui/buttonGraphics" ]; then cp -R src/gui/buttonGraphics $targetdir/gui/; fi
 
diff --git a/configurations/Broadcasts.txt b/configurations/Broadcasts.txt
@@ -0,0 +1,9 @@
+# Only few nodes to see what's going on
+Group.nrofHosts = 4
+
+# Change class of the first event generator s.t. broadcasts are produced
+Events1.class = BroadcastEventGenerator
+# Only few messages to see what's going on (one new message every 10 mins).
+Events1.interval = 600,600
+# Adapt range of message source/destination addresses to fewer hosts.
+Events1.hosts = 0,17
diff --git a/configurations/Multicasts.txt b/configurations/Multicasts.txt
@@ -0,0 +1,11 @@
+Group.nrofHosts = 5
+
+# Change class of the first event generator s.t. multicasts are produced
+Events1.class = MulticastEventGenerator
+# Only few messages to see what's going on (one new message every 10 mins).
+Events1.interval = 600,600
+# Adapt range of message source/destination addresses to fewer hosts.
+Events1.hosts = 0,10
+
+Report.nrofReports = 1
+Report.report1 = MulticastMessageDeliveryReport
diff --git a/configurations/deliveryProbabilityReport_settings.txt b/configurations/deliveryProbabilityReport_settings.txt
@@ -0,0 +1,14 @@
+#
+# Delivery Probability Report
+#
+
+## Scenario settings
+Scenario.name = deliveryProbabilityReport
+
+## Reports - all report names have to be valid report classes
+
+# how many reports to load
+Report.nrofReports = 1
+
+# Report classes to load
+Report.report1 = DeliveryProbabilityReport
diff --git a/configurations/evaluation/settingsDisasterRouter.txt b/configurations/evaluation/settingsDisasterRouter.txt
@@ -0,0 +1,38 @@
+# Add this file as argument if you want to use DisasterRouter
+
+Group.router = DisasterRouter
+DisasterRouter.powerThreshold = 0.1
+
+# Parameters for rating mechanisms
+
+DeliveryPredictabilityStorage.dpInit = 0.75
+DeliveryPredictabilityStorage.dpGamma = 0.98
+DeliveryPredictabilityStorage.dpBeta = 0.25
+DeliveryPredictabilityStorage.windowLength = 30
+
+EncounterValue.agingFactor = 0.85
+EncounterValue.windowLength = 360
+
+ReplicationsDensity.windowLength = 360
+
+# Parameters for message choosing
+UtilityMessageChooser.dpWeight = 0.9
+UtilityMessageChooser.powerWeight = 0.1
+UtilityMessageChooser.prophetPlusWeight = 0.5
+UtilityMessageChooser.rdWeight = 0.2
+UtilityMessageChooser.evWeight = 0.3
+UtilityMessageChooser.messageUtilityThreshold = 0.45
+UtilityMessageChooser.powerThreshold = 0.1
+
+RescueModeMessageChooser.powerThreshold = 0.1
+RescueModeMessageChooser.shortTimespanThreshold = 1800
+
+# Parameters for prioritization
+DisasterPrioritization.headStartThreshold = 300
+DisasterPrioritization.priorityThreshold = 5
+DisasterPrioritization.dpWeight = 0.5
+
+# Parameters for buffer management
+DisasterBufferComparator.hopThreshold = 6
+DisasterBufferComparator.ageThreshold = 300
+DisasterBufferComparator.dpWeight = 0.5
diff --git a/configurations/evaluation/settingsProphet.txt b/configurations/evaluation/settingsProphet.txt
@@ -0,0 +1,4 @@
+# Add this file as argument if you want to use ProphetRouter
+
+Group.router = ProphetRouter
+ProphetRouter.secondsInTimeUnit = 30
diff --git a/configurations/evaluation/settingsScenarioLongFewEvents.txt b/configurations/evaluation/settingsScenarioLongFewEvents.txt
@@ -0,0 +1,12 @@
+## Scenarios with duration of three days and with few events
+## Scenario used for the evaluation of the different routing protocols
+## Scenario settings
+# 259200s = 72h = 3d
+Scenario.endTime = 259200
+Scenario.name = three_days_few_events
+
+#Settings for the disaster and hospital events
+# max number of external events to preload
+Events1.nrofPreload = 7
+# path to external events file
+Events1.filePath = ee/VhmEvents/eventsScenarioFew.json
diff --git a/configurations/evaluation/settingsScenarioLongManyEvents.txt b/configurations/evaluation/settingsScenarioLongManyEvents.txt
@@ -0,0 +1,12 @@
+## Scenarios with duration of three days and with many events
+## Scenario used for the evaluation of the different routing protocols
+## Scenario settings
+# 259200s = 72h = 3d
+Scenario.endTime = 259200
+Scenario.name = three_days_many_events
+
+#Settings for the disaster and hospital events
+# max number of external events to preload
+Events1.nrofPreload = 24
+# path to external events file 
+Events1.filePath = ee/VhmEvents/eventsScenarioMany.json
diff --git a/configurations/evaluation/settingsScenarioMediumFewEvents.txt b/configurations/evaluation/settingsScenarioMediumFewEvents.txt
@@ -0,0 +1,12 @@
+## Scenarios with duration of one day and with few events
+## Scenario used for the evaluation of the different routing protocols
+## Scenario settings
+# 86400s = 24h = 1d
+Scenario.endTime = 86400
+Scenario.name = one_day_few_events
+
+#Settings for the disaster and hospital events
+# max number of external events to preload
+Events1.nrofPreload = 7
+# path to external events file
+Events1.filePath = ee/VhmEvents/eventsScenarioFewMediumDuration.json
diff --git a/configurations/evaluation/settingsScenarioMediumManyEvents.txt b/configurations/evaluation/settingsScenarioMediumManyEvents.txt
@@ -0,0 +1,12 @@
+## Scenarios with duration of one day and with many events
+## Scenario used for the evaluation of the different routing protocols
+## Scenario settings
+# 86400s = 24h = 1d
+Scenario.endTime = 86400
+Scenario.name = one_day_many_events
+
+#Settings for the disaster and hospital events
+# max number of external events to preload
+Events1.nrofPreload = 24
+# path to external events file 
+Events1.filePath = ee/VhmEvents/eventsScenarioManyMediumDuration.json
diff --git a/configurations/evaluation/settingsScenarioRealistic.txt b/configurations/evaluation/settingsScenarioRealistic.txt
@@ -0,0 +1,12 @@
+## Scenarios with duration of one day and with many events
+## Scenario used for the evaluation of the different routing protocols
+## Scenario settings
+# 50400s = 14h about one day from 8am to 22pm
+Scenario.endTime = 50400
+Scenario.name = realisticScenario
+
+#Settings for the disaster and hospital events
+# max number of external events to preload
+Events1.nrofPreload = 24
+# path to external events file 
+Events1.filePath = ee/VhmEvents/eventsRealisticScenario.json