Merge branch 'develop'

Author: fuvidani

README.md

@@ -2,11 +2,10 @@
 Solver for the Electric Vehicle Routing Problem with Time Windows.
 
 <p align="center">
-  <img src="http://ls11-www.cs.tu-dortmund.de/people/chimani/VehicleRouting/vr.png">
+  <img src="http://ls11-www.cs.tu-dortmund.de/people/chimani/VehicleRouting/vr.png"><br/>
+  <a href="http://ls11-www.cs.tu-dortmund.de/people/chimani/VehicleRouting/" target="_blank">Image Source<a/>
 </p>
 
-[Image Source](http://ls11-www.cs.tu-dortmund.de/people/chimani/VehicleRouting/)
-
 ## Problem description
 In the E-VRPTW, a set of customers must be served by a fleet of battery electric 
 vehicles (BEV). The E-VRPTW extends the well-know [VRPTW](https://en.wikipedia.org/wiki/Vehicle_routing_problem), 
@@ -20,7 +19,7 @@ More formal, the EVRPTW is defined on a complete directed graph G = (V,A)
 consisting of a set of depot, customer, and recharging station nodes and a set of edges. 
 Each edge _(i, j)_ has a distance _d<sub>ij</sub>_ and a travel time  _t<sub>ij</sub>_ associated and each traveled 
 edge consumes the amount of _r_ x _d<sub>ij</sub>_ of the remaining battery charge of the vehicle, 
-where _h_ denotes the constant charge consumption rate. Furthermore, a set of homogeneous 
+where _r_ denotes the constant charge consumption rate. Furthermore, a set of homogeneous 
 vehicles is given, where each vehicle has a maximal capacity of _C_ and is located, full 
 loaded at the depot. Each node has a positive demand  _q<sub>i</sub>_, a service time  _s<sub>i</sub>_ and a time 
 window [ _e<sub>i</sub>_, _l<sub>i</sub>_ ] assigned. The service must start within the given time window (thus, 
@@ -34,13 +33,31 @@ served within their given time window. All routes must begin and end in the depo
 the vehicle capacity and battery capacity must be respected. The objective function is 
 to minimize the total traveled distance.
 
+## Implementation Details
+
+Our E-VRPTW Solver consists of two parts:
+1. Construction heuristic: [Time-Oriented, Nearest-Neighbor Heuristic](https://pubsonline.informs.org/doi/abs/10.1287/opre.35.2.254?journalCode=opre) (Solomon 1987)
+2. Metaheuristic: For this part, we tried to implement a Hybrid VNS/TS metaheuristic proposed in the paper [The Electric Vehicle-Routing Problem with Time Windows and Recharging Stations](https://pubsonline.informs.org/doi/10.1287/trsc.2013.0490),
+however our solution is not the most efficient one and requires further optimizations (especially in route representation)  
+
+Model objects like `EVRPTWInstance`, `Customer`, `Node` have been copied from the [E-VRPTW Solution Verifier (Java)](https://github.com/ghiermann/evrptw-verifier) implemented by @ghiermann.
+
+See our [presentation slides](https://docs.google.com/presentation/d/1WnySkapfZkM57kC_8XTIKsyNZOhBhiNAdNTUWY201tQ/edit?usp=sharing) for more details.
+
 ## Usage
 
-// to be written
+See Main.kt for instance/plotting/performance-recording customizations.
+
 
 ## Contributions
 Special thanks to my dear friend and colleague [David Molnar](https://github.com/dmolnar99)
-for participating in this project.
+for participating in this project:
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore -->
+| [<img src="https://avatars3.githubusercontent.com/u/16260193?s=400&v=4" width="100px;"/><br /><sub><b>David Molnar</b></sub>](https://github.com/dmolnar99)<br />[🤔](#ideas "Ideas and Planning") [💻](https://github.com/fuvidani/clickbait-defeater/commits?author=dmolnar99 "Code") [⚠️](https://github.com/fuvidani/clickbait-defeater/commits?author=dmolnar99 "Tests") |
+| :---: |
+<!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## License
 This project is licensed under the [MIT License](https://opensource.org/licenses/MIT). Feel free to

build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'kotlin-allopen'
 apply plugin: 'application'
 
 group ='at.ac.tuwien.otl'
-version = '1.0-SNAPSHOT'
+version = '1.0.0'
 mainClassName = 'at.ac.tuwien.otl.Main'
 
 repositories {
@@ -32,6 +32,8 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     ktlint "com.github.shyiko:ktlint:0.23.0"
     compile fileTree(dir: 'libs', include: '*.jar')
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
+    compile group: 'org.graphstream', name: 'gs-core', version: '1.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.3'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.0.3'