diff --git a/README.md b/README.md
index 2dacd4500719662ef5b3a794fe6f4fb154aafdb4..183758b1c7cec512dc961ae7fca44b33d7174eaf 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,6 @@ All modules are prefixed with `jastadd-mquat`, as this is an implementation of M
 - `solver-ilp`: Reference implementation using ILP
 - `solver-simple`: Naïve, brute-force solver written in Java
 
-**TODO: Check links** https://git-st.inf.tu-dresden.de/stgroup/ttc18/blob/master/jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/BenchmarkableSolver.java
-
 ## Creating a solution
 
 A new solution should be created using a new module (or multiple, if necessary). You can use the simple-solver module as an example.
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv
deleted file mode 100644
index 431245877d8b9029bf3d9f815248fb68399ff06a..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilpGeneration,ilpSolving,initialObjective,ilpObjective
-1,1,1,1,1,2,1,1,0,1,0,26,0,0,0.0,0.0
-1,1,1,1,1,2,1,1,25,1,0,7,82,131,2668443.7099999995,2020737.26
-1,1,1,1,1,2,1,1,50,1,0,7,63,171,4241926.700000002,3228965.0
-1,1,1,1,1,2,1,1,75,1,0,6,109,60321,7021993.930000003,5459681.98
-1,1,1,1,1,2,1,1,100,1,0,8,189,525,9159741.290000001,7181905.64
-1,1,1,2,1,2,1,1,0,1,0,1,0,0,0.0,0.0
-1,1,1,2,1,2,1,1,25,1,0,2,82,107,6209612.91,4534688.64
-1,1,1,2,1,2,1,1,50,1,0,2,281,510,1.4405934880000006E7,1.042163198E7
-1,1,1,2,1,2,1,1,75,1,0,7,562,1115,2.6732370939999983E7,1.865061939E7
-1,1,1,2,1,2,1,1,100,1,0,7,1134,2910,3.5270170789999954E7,2.571826968E7
-1,1,1,3,1,2,1,1,0,1,0,0,0,0,0.0,0.0
-1,1,1,3,1,2,1,1,25,1,0,2,68,90,7423021.679999999,4073910.15
-1,1,1,3,1,2,1,1,50,1,0,2,239,392,1.9320319169999994E7,1.099436497E7
-1,1,1,3,1,2,1,1,75,1,0,4,680,975,2.928928794999999E7,1.701516569E7
-1,1,1,3,1,2,1,1,100,1,0,5,1059,61834,4.2870849489999995E7,2.389607656E7
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv.html b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv.html
deleted file mode 100644
index ecb5d110db9df275d305d179c5ac10de9fc61f21..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-10-15-44-09.csv.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<table>
-<tr><th>topLevelComponents</th><th>avgSubComponents</th><th>subComponentStdDerivation</th><th>componentDepth</th><th>implementations</th><th>modes</th><th>computeResources</th><th>nonfunctionalProperties</th><th>requests</th><th>cpus</th><th>seed</th><th>modelGeneration</th><th>ilpGeneration</th><th>ilpSolving</th><th>initialObjective</th><th>ilpObjective</th></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>1</td><td>0</td><td>1</td><td>0</td><td>26</td><td>0</td><td>0</td><td>0.0</td><td>0.0</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>1</td><td>25</td><td>1</td><td>0</td><td>7</td><td>82</td><td>131</td><td>2668443.7099999995</td><td>2020737.26</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>1</td><td>50</td><td>1</td><td>0</td><td>7</td><td>63</td><td>171</td><td>4241926.700000002</td><td>3228965.0</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>1</td><td>75</td><td>1</td><td>0</td><td>6</td><td>109</td><td>60321</td><td>7021993.930000003</td><td>5459681.98</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>1</td><td>100</td><td>1</td><td>0</td><td>8</td><td>189</td><td>525</td><td>9159741.290000001</td><td>7181905.64</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>2</td><td>1</td><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0.0</td><td>0.0</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>2</td><td>1</td><td>1</td><td>25</td><td>1</td><td>0</td><td>2</td><td>82</td><td>107</td><td>6209612.91</td><td>4534688.64</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>2</td><td>1</td><td>1</td><td>50</td><td>1</td><td>0</td><td>2</td><td>281</td><td>510</td><td>1.4405934880000006E7</td><td>1.042163198E7</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>2</td><td>1</td><td>1</td><td>75</td><td>1</td><td>0</td><td>7</td><td>562</td><td>1115</td><td>2.6732370939999983E7</td><td>1.865061939E7</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>2</td><td>1</td><td>2</td><td>1</td><td>1</td><td>100</td><td>1</td><td>0</td><td>7</td><td>1134</td><td>2910</td><td>3.5270170789999954E7</td><td>2.571826968E7</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>3</td><td>1</td><td>2</td><td>1</td><td>1</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0.0</td><td>0.0</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>3</td><td>1</td><td>2</td><td>1</td><td>1</td><td>25</td><td>1</td><td>0</td><td>2</td><td>68</td><td>90</td><td>7423021.679999999</td><td>4073910.15</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>3</td><td>1</td><td>2</td><td>1</td><td>1</td><td>50</td><td>1</td><td>0</td><td>2</td><td>239</td><td>392</td><td>1.9320319169999994E7</td><td>1.099436497E7</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>3</td><td>1</td><td>2</td><td>1</td><td>1</td><td>75</td><td>1</td><td>0</td><td>4</td><td>680</td><td>975</td><td>2.928928794999999E7</td><td>1.701516569E7</td></tr>
-<tr><td>1</td><td>1</td><td>1</td><td>3</td><td>1</td><td>2</td><td>1</td><td>1</td><td>100</td><td>1</td><td>0</td><td>5</td><td>1059</td><td>61834</td><td>4.2870849489999995E7</td><td>2.389607656E7</td></tr>
-</table>
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-14-21.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-14-21.csv
deleted file mode 100644
index 93f7ddede2137ed42195f2e2589eafee72853bc7..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-14-21.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-directGeneration,ilp-directSolving,,ilp-externalValid,ilp-directValidinitialObjective,ilp-externalObjective,ilp-directObjective
-2018-01-12-15-14-21,1,1,1,1,1,2,1,1,0,1,0,24,0,0,true,0,0,true,0.0,0.0,0.0
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-19-24.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-19-24.csv
deleted file mode 100644
index d3c701f89405cd40944fabcaf87fee73ea9a71e0..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-19-24.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-directGeneration,ilp-directSolving,,ilp-externalValid,ilp-directValidinitialObjective,ilp-externalObjective,ilp-directObjective
-2018-01-12-15-19-24,1,1,1,1,1,2,1,1,0,1,0,25,0,0,true,0,0,true,0.0,0.0,0.0
-2018-01-12-15-19-24,1,1,1,1,1,2,1,1,25,1,0,10,74,115,true,53,0,true,2668443.71,2020737.26,2020737.26
-2018-01-12-15-19-25,1,1,1,1,1,2,1,1,50,1,0,12,80,146,true,82,0,true,4241926.700000001,3228965.0,3228965.0000000005
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-26-31.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-26-31.csv
deleted file mode 100644
index 598b69fc3bdae1dcfed85936a5013df45dcb8ce3..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-26-31.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-directGeneration,ilp-directSolving,,ilp-externalValid,ilp-directValidinitialObjective,ilp-externalObjective,ilp-directObjective
-2018-01-12-15-26-31,1,1,1,1,1,2,1,1,0,1,0,31,0,0,true,0,0,true,0.0,0.0,0.0
-2018-01-12-15-26-31,1,1,1,1,1,2,1,1,25,1,0,12,88,124,true,54,0,true,2668443.7100000004,2020737.26,2020737.26
-2018-01-12-15-26-33,1,1,1,1,1,2,1,1,50,1,0,35,79,231,true,69,0,true,4241926.700000002,3228965.0,3228965.0000000005
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-35-38.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-35-38.csv
deleted file mode 100644
index fbf3efb761763201449740d9d1951e11fa911835..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-15-35-38.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-directGeneration,ilp-directSolving,,ilp-externalValid,ilp-directValidinitialObjective,ilp-externalObjective,ilp-directObjective
-2018-01-12-15-35-38,1,1,1,1,1,2,1,1,0,1,0,26,0,0,true,0,0,true,0.0,0.0,0.0
-2018-01-12-15-35-38,1,1,1,1,1,2,1,1,25,1,0,9,86,122,true,50,0,true,2668443.71,2020737.26,2020737.2600000005
-2018-01-12-15-35-39,1,1,1,1,1,2,1,1,50,1,0,6,57,142,true,79,0,true,4241926.700000001,3228965.0,3228965.0000000014
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-16-47-31.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-16-47-31.csv
deleted file mode 100644
index 48c65c85dc83074b46d12b47e14b2642ba412248..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-12-16-47-31.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-directGeneration,ilp-directSolving,,ilp-externalValid,ilp-directValidinitialObjective,ilp-externalObjective,ilp-directObjective
-2018-01-12-16-47-31,1,1,1,1,1,2,1,1,0,1,0,27,0,0,true,0,0,true,0.0,0.0,0.0
-2018-01-12-16-47-31,1,1,1,1,1,2,1,1,25,1,0,8,89,137,true,62,0,true,2668443.71,2020737.26,2020737.2600000005
-2018-01-12-16-47-32,1,1,1,1,1,2,1,1,50,1,0,14,79,180,true,63,0,true,4241926.7,3228965.0,3228965.0
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-09-56-57.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-09-56-57.csv
deleted file mode 100644
index 2098bda39c7e92ec76ac56b7c3373d91c078a741..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-09-56-57.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-09-56-57,1,1,1,1,1,2,1,1,0,1,0,24,0,0,true,0.0,0.0
-2018-01-15-09-56-57,1,1,1,1,1,2,1,1,25,1,0,8,71,166,true,2668443.71,2020737.26
-2018-01-15-09-56-57,1,1,1,1,1,2,1,1,50,1,0,6,58,217,true,4241926.700000001,3228965.0
-2018-01-15-09-57-01,1,1,1,1,1,2,1,1,75,1,0,7,123,60311,true,7021993.930000001,5459681.98
-2018-01-15-09-58-09,1,1,1,1,1,2,1,1,100,1,0,6,180,421,true,9159741.290000003,7181905.64
-2018-01-15-09-58-30,1,1,1,2,1,2,1,1,0,1,0,1,0,0,true,0.0,0.0
-2018-01-15-09-58-30,1,1,1,2,1,2,1,1,25,1,0,2,89,110,true,6209612.910000001,4534688.64
-2018-01-15-09-58-34,1,1,1,2,1,2,1,1,50,1,0,4,556,841,true,1.4405934880000008E7,1.042163198E7
-2018-01-15-09-59-01,1,1,1,2,1,2,1,1,75,1,0,6,552,1048,true,2.6732370939999975E7,1.865061939E7
-2018-01-15-10-00-34,1,1,1,2,1,2,1,1,100,1,0,8,1042,2310,true,3.527017078999998E7,2.571826968E7
-2018-01-15-10-04-45,1,1,1,3,1,2,1,1,0,1,0,0,0,0,true,0.0,0.0
-2018-01-15-10-04-45,1,1,1,3,1,2,1,1,25,1,0,2,63,86,true,7423021.680000001,4073910.15
-2018-01-15-10-04-48,1,1,1,3,1,2,1,1,50,1,0,1,235,375,true,1.9320319170000006E7,1.099436497E7
-2018-01-15-10-05-13,1,1,1,3,1,2,1,1,75,1,0,4,873,1261,true,2.9289287949999996E7,1.701516569E7
-2018-01-15-10-06-41,1,1,1,3,1,2,1,1,100,1,0,4,1046,61773,true,4.287084948999997E7,2.389607656E7
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-10-57-58.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-10-57-58.csv
deleted file mode 100644
index 85f9f51c0480e6b3656c4b179e51ffd7b4fb39c5..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-10-57-58.csv
+++ /dev/null
@@ -1,16 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-10-57-58,1,1,0,1,1,2,40,1,0,1,0,1,1,2,30,0,0,true,0.0,0.0
-2018-01-15-10-57-58,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,124,152,true,3754269.869999999,2809811.2
-2018-01-15-10-57-59,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,51,139,true,8614715.24,6382704.29
-2018-01-15-10-58-02,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,116,305,true,1.1206278750000004E7,7289379.27
-2018-01-15-10-58-10,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,194,407,true,1.4461749410000004E7,9440690.9
-2018-01-15-10-58-29,1,1,0,2,1,2,40,1,0,1,0,2,2,4,1,0,0,true,0.0,0.0
-2018-01-15-10-58-29,1,1,0,2,1,2,40,1,25,1,0,2,2,4,2,99,115,true,4660419.600000002,2402332.35
-2018-01-15-10-58-33,1,1,0,2,1,2,40,1,50,1,0,2,2,4,3,249,552,true,1.1654015820000006E7,6165636.19
-2018-01-15-10-58-58,1,1,0,2,1,2,40,1,75,1,0,2,2,4,8,546,1171,true,1.3830861550000008E7,7487402.99
-2018-01-15-11-00-25,1,1,0,2,1,2,40,1,100,1,0,2,2,4,5,1031,1749,true,1.8353526140000004E7,9967414.22
-2018-01-15-11-04-07,1,1,0,3,1,2,40,1,0,1,0,3,3,6,1,0,0,true,0.0,0.0
-2018-01-15-11-04-07,1,1,0,3,1,2,40,1,25,1,0,3,3,6,3,219,206,true,1.1553344309999999E7,8121836.9
-2018-01-15-11-04-18,1,1,0,3,1,2,40,1,50,1,0,3,3,6,2,738,1167,true,2.8331707599999998E7,2.143625945E7
-2018-01-15-11-05-53,1,1,0,3,1,2,40,1,75,1,0,3,3,6,7,1429,2379,true,3.367488789999999E7,2.413993455E7
-2018-01-15-11-11-36,1,1,0,3,1,2,40,1,100,1,0,3,3,6,6,2973,4977,true,4.374915701E7,3.133061251E7
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-04-45.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-04-45.csv
deleted file mode 100644
index 073c7506a69b823b8b9b428231957dea8a1eca55..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-04-45.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-04-46,1,1,0,1,1,2,40,1,0,1,0,1,1,2,28,0,0,true,0.0,0.0
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-16.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-16.csv
deleted file mode 100644
index a8639ef00eaef7f2d0548ee21f289f0a810e6974..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-16.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-05-16,1,1,0,1,1,2,40,1,0,1,0,1,1,2,27,0,0,true,0.0,0.0
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-40.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-40.csv
deleted file mode 100644
index a014cd98ac632d684d70323bf20a818f91e96f69..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-05-40.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-05-40,1,1,0,1,1,2,40,1,0,1,0,1,1,2,36,0,0,true,0.0,0.0
-2018-01-15-15-05-40,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,100,166,true,3754269.8699999996,2809811.2
-2018-01-15-15-05-41,1,1,0,1,1,2,40,1,50,1,0,1,1,2,15,82,237,true,8614715.240000002,6382704.29
-2018-01-15-15-05-45,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,109,323,true,1.120627875E7,7289379.27
-2018-01-15-15-05-55,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,258,544,true,1.4461749410000006E7,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-20-56.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-20-56.csv
deleted file mode 100644
index 4d761ace2556f0981d63c4f83d5d93d1002c9ccc..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-20-56.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-20-56,1,1,0,1,1,2,40,1,0,1,0,1,1,2,24,0,0,true,0.0,0.0
-2018-01-15-15-20-56,1,1,0,1,1,2,40,1,25,1,0,1,1,2,8,110,140,true,3754269.8699999996,2809811.2
-2018-01-15-15-20-58,1,1,0,1,1,2,40,1,50,1,0,1,1,2,30,123,380,true,8614715.24,6382704.29
-2018-01-15-15-21-02,1,1,0,1,1,2,40,1,75,1,0,1,1,2,4,116,299,true,1.1206278750000002E7,7289379.27
-2018-01-15-15-21-11,1,1,0,1,1,2,40,1,100,1,0,1,1,2,4,192,430,true,1.4461749410000006E7,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-25-31.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-25-31.csv
deleted file mode 100644
index 122bc9b7e75794c1972a8993779fb197e9974095..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-25-31.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-25-31,1,1,0,1,1,2,40,1,0,1,0,1,1,2,49,0,0,true,0.0,0.0
-2018-01-15-15-25-31,1,1,0,1,1,2,40,1,25,1,0,1,1,2,25,385,180,true,3754269.8699999996,2809811.2
-2018-01-15-15-25-32,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,74,138,true,8614715.240000002,6382704.29
-2018-01-15-15-25-35,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,103,299,true,1.1206278750000002E7,7289379.27
-2018-01-15-15-25-43,1,1,0,1,1,2,40,1,100,1,0,1,1,2,4,175,431,true,1.4461749410000002E7,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-30-27.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-30-27.csv
deleted file mode 100644
index 0b5579e6162b9164b32b5601fa78f012fe477386..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-30-27.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-30-27,1,1,0,1,1,2,40,1,0,1,0,1,1,2,61,0,0,true,0.0,0.0
-2018-01-15-15-30-27,1,1,0,1,1,2,40,1,25,1,0,1,1,2,25,262,197,true,3754269.8699999996,2809811.2
-2018-01-15-15-30-29,1,1,0,1,1,2,40,1,50,1,0,1,1,2,4,47,165,true,8614715.240000002,6382704.29
-2018-01-15-15-30-31,1,1,0,1,1,2,40,1,75,1,0,1,1,2,4,100,290,true,1.1206278750000002E7,7289379.27
-2018-01-15-15-30-39,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,181,402,true,1.4461749410000002E7,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-37-35.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-37-35.csv
deleted file mode 100644
index 7f0f1bef1085e1e5926ed49f030fa07b50b1d934..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-15-15-37-35.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration,ilp-externalSolving,ilp-externalValid,initialObjective,ilp-externalObjective
-2018-01-15-15-37-35,1,1,0,1,1,2,40,1,0,1,0,1,1,2,27,0,0,true,0.0,0.0
-2018-01-15-15-37-35,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,134,169,true,3754269.8699999987,2809811.2
-2018-01-15-15-37-37,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,50,136,true,8614715.24,6382704.29
-2018-01-15-15-37-39,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,126,338,true,1.1206278750000004E7,7289379.27
-2018-01-15-15-37-48,1,1,0,1,1,2,40,1,100,1,0,1,1,2,3,188,422,true,1.4461749410000011E7,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-19-13-42-26.csv b/jastadd-mquat-benchmark/old-results/benchmark-2018-01-19-13-42-26.csv
deleted file mode 100644
index 73b59b7879dfa1ea020648d11b682c7698fb9e95..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/benchmark-2018-01-19-13-42-26.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,ilp-externalGen,ilp-externalSolved,ilp-externalValid,ilp-externalTimeOut,ilp-directGen,ilp-directSolved,ilp-directValid,ilp-directTimeOut,simpleSolved,simpleValid,simpleTimeOut,mh-naiveGen,mh-naiveSolved,mh-naiveValid,mh-naiveTimeOut,initObj,ilp-externalObj,ilp-directObj,simpleObj,mh-naiveObj
-2018-01-19-13-42-26,1,1,0,1,3,2,1.0,1,0,1,0,1,3,6,32,0,0,true,false,0,0,true,false,0,true,false,9,0,true,false,0.0,0.0,0.0,0.0,0.0
-2018-01-19-13-42-26,1,1,0,1,3,2,1.0,1,1,1,0,1,3,6,4,11,29,true,false,2,12,true,false,1,true,false,0,0,false,false,5707.990000000001,5707.99,5707.990000000001,5707.990000000001,-44193.0
-2018-01-19-13-42-32,1,1,0,1,3,2,1.0,1,2,1,0,1,3,6,1,3,18,true,false,2,3,true,false,6,true,false,0,0,false,false,128796.79,128796.79,128796.79,128796.79,-380368.0
-2018-01-19-13-42-37,1,1,0,1,3,2,1.0,1,3,1,0,1,3,6,1,3,20,true,false,3,5,true,false,10,true,false,0,0,false,false,305746.44999999995,305746.45,305746.45,305746.44999999995,-388455.0
-2018-01-19-13-42-42,1,1,0,1,3,2,1.0,1,4,1,0,1,3,6,0,4,24,true,false,4,6,true,false,29,true,false,0,0,false,false,155750.37,109479.6,109479.59999999999,109479.59999999999,-548381.0
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-12936-id-0-2018_01_16_09_40_57.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-12936-id-0-2018_01_16_09_40_57.jfr
deleted file mode 100644
index 32247b28b0f398319b4530eea0ed6f8fa1f20ed4..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-12936-id-0-2018_01_16_09_40_57.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-13273-id-0-2018_01_16_09_44_49.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-13273-id-0-2018_01_16_09_44_49.jfr
deleted file mode 100644
index 2931d18307827143050f4fdca8df2ffa4b2ddee6..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-13273-id-0-2018_01_16_09_44_49.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-13399-id-0-2018_01_16_09_46_03.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-13399-id-0-2018_01_16_09_46_03.jfr
deleted file mode 100644
index c06a529561831ebf044ab1a41239dcb70034be59..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-13399-id-0-2018_01_16_09_46_03.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-13929-id-0-2018_01_16_09_53_29.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-13929-id-0-2018_01_16_09_53_29.jfr
deleted file mode 100644
index 658c620070cfa473b43846cb52196129ea34b491..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-13929-id-0-2018_01_16_09_53_29.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-14053-id-0-2018_01_16_09_54_58.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-14053-id-0-2018_01_16_09_54_58.jfr
deleted file mode 100644
index 914b8d26a6f35a0f49c7b0b82d15510d447c6389..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-14053-id-0-2018_01_16_09_54_58.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-15549-id-0-2018_01_16_10_21_13.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-15549-id-0-2018_01_16_10_21_13.jfr
deleted file mode 100644
index 2cd9862d2e1af3e8cbbd638ae770ee550393793d..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-15549-id-0-2018_01_16_10_21_13.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-15725-id-0-2018_01_16_10_22_46.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-15725-id-0-2018_01_16_10_22_46.jfr
deleted file mode 100644
index a94f296854546126343b8c4674c30f848e4f8fd5..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-15725-id-0-2018_01_16_10_22_46.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-16103-id-0-2018_01_16_10_30_05.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-16103-id-0-2018_01_16_10_30_05.jfr
deleted file mode 100644
index 13153210d545d477e643b6b566a177aa2401a5e2..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-16103-id-0-2018_01_16_10_30_05.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-16312-id-0-2018_01_16_10_32_20.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-16312-id-0-2018_01_16_10_32_20.jfr
deleted file mode 100644
index 6235a964bafe18329097d9b3f1640b9340515f87..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-16312-id-0-2018_01_16_10_32_20.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-16665-id-0-2018_01_16_10_42_02.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-16665-id-0-2018_01_16_10_42_02.jfr
deleted file mode 100644
index f0f5cdfd8d109b1a838f70452a51fd58d37efd3b..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-16665-id-0-2018_01_16_10_42_02.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-17153-id-0-2018_01_16_10_52_10.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-17153-id-0-2018_01_16_10_52_10.jfr
deleted file mode 100644
index 353f2746f776410d861960fb418775547a3e6b5e..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-17153-id-0-2018_01_16_10_52_10.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-17652-id-0-2018_01_16_10_58_50.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-17652-id-0-2018_01_16_10_58_50.jfr
deleted file mode 100644
index ecb1fcddd018c91b023a4e5f7659d1db9beb7b1c..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-17652-id-0-2018_01_16_10_58_50.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-19585-id-0-2018_01_18_16_17_27.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-19585-id-0-2018_01_18_16_17_27.jfr
deleted file mode 100644
index d54e1cceca3d21dda717a6700b9b55811d45e506..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-19585-id-0-2018_01_18_16_17_27.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-21065-id-0-2018_01_18_16_38_52.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-21065-id-0-2018_01_18_16_38_52.jfr
deleted file mode 100644
index d968541362ed6e4157611d735f82cd74b1f1a969..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-21065-id-0-2018_01_18_16_38_52.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-21281-id-0-2018_01_17_10_54_02.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-21281-id-0-2018_01_17_10_54_02.jfr
deleted file mode 100644
index 5627c65532963b9a6b38db005b02bb8ad00ddafb..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-21281-id-0-2018_01_17_10_54_02.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-21384-id-0-2018_01_17_10_55_04.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-21384-id-0-2018_01_17_10_55_04.jfr
deleted file mode 100644
index 2bce544112884d9698d757bc1c8e0b9354c088d5..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-21384-id-0-2018_01_17_10_55_04.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-21546-id-0-2018_01_17_10_57_05.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-21546-id-0-2018_01_17_10_57_05.jfr
deleted file mode 100644
index b27058590a0eb8eac22f6d0c5c0be6276fdc4376..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-21546-id-0-2018_01_17_10_57_05.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-22267-id-0-2018_01_16_12_15_58.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-22267-id-0-2018_01_16_12_15_58.jfr
deleted file mode 100644
index 2cf0c9f908b2143cfdb65ddc8c4f9787f2db6afa..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-22267-id-0-2018_01_16_12_15_58.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-22524-id-0-2018_01_16_12_19_48.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-22524-id-0-2018_01_16_12_19_48.jfr
deleted file mode 100644
index 9abd96646206b12e35d79dcb299460c199ec6b00..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-22524-id-0-2018_01_16_12_19_48.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-26593-id-0-2018_01_16_13_56_39.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-26593-id-0-2018_01_16_13_56_39.jfr
deleted file mode 100644
index d9fa079f1bda7185ae872dcc9a01bd30faea8655..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-26593-id-0-2018_01_16_13_56_39.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-26782-id-0-2018_01_16_14_00_27.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-26782-id-0-2018_01_16_14_00_27.jfr
deleted file mode 100644
index 75495b5d2c0f5380d7968405fccccf0581427206..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-26782-id-0-2018_01_16_14_00_27.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/hotspot-pid-32178-id-0-2018_01_15_15_38_07.jfr b/jastadd-mquat-benchmark/old-results/hotspot-pid-32178-id-0-2018_01_15_15_38_07.jfr
deleted file mode 100644
index 85034b759a88ecb9ed8e97e1b064a4cf37ca421e..0000000000000000000000000000000000000000
Binary files a/jastadd-mquat-benchmark/old-results/hotspot-pid-32178-id-0-2018_01_15_15_38_07.jfr and /dev/null differ
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-40-49.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-40-49.csv
deleted file mode 100644
index 8e289cbb1a93a21f5108c3f98a3a391fe8ffdfe2..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-40-49.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGenerationStart,ilp-externalSolvingStart,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidStart,ilp-externalValidHard,ilp-externalValidEasy,initialObjective,ilp-externalObjectiveStart,ilp-externalObjectiveHard,ilp-externalObjectiveEasy
-2018-01-16-09-40-49,1,1,0,1,1,2,40,1,0,1,0,1,1,2,28,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0
-2018-01-16-09-40-49,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,140,295,true,36,155,true,27,136,true,3754269.8699999996,2809811.2,2809811.2,2809811.2
-2018-01-16-09-40-50,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,65,264,true,81,260,true,72,261,true,8614715.240000002,6382704.29,6382704.29,6382704.29
-2018-01-16-09-40-51,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,118,509,true,164,548,true,165,577,true,1.1206278750000004E7,7289379.27,7289379.27,7289379.27
-2018-01-16-09-40-53,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,204,907,true,309,887,true,206,752,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-44-41.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-44-41.csv
deleted file mode 100644
index cb9d753bc4c5acf5ba5640fda9feae31795c6924..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-44-41.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGenerationStart,ilp-externalSolvingStart,ilp-externalValidStart,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,initialObjective,ilp-externalObjectiveStart,ilp-externalObjectiveHard,ilp-externalObjectiveEasy
-2018-01-16-09-44-41,1,1,0,1,1,2,40,1,0,1,0,1,1,2,29,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0
-2018-01-16-09-44-41,1,1,0,1,1,2,40,1,25,1,0,1,1,2,11,122,279,true,49,185,true,38,145,true,3754269.8699999996,2809811.2,2809811.2,2809811.2
-2018-01-16-09-44-42,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,86,331,true,69,250,true,104,277,true,8614715.240000002,6382704.29,6382704.29,6382704.29
-2018-01-16-09-44-43,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,140,505,true,146,739,true,193,579,true,1.1206278750000004E7,7289379.27,7289379.27,7289379.27
-2018-01-16-09-44-45,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,288,949,true,267,789,true,216,772,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-45-51.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-45-51.csv
deleted file mode 100644
index 6d0a3fd3433f10cc25ba0a9b36597c4c353498a4..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-45-51.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGenerationStart,ilp-externalSolvingStart,ilp-externalValidStart,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGenerationStart,ilp-directSolvingStart,ilp-directValidStart,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjectiveStart,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjectiveStart,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-09-45-51,1,1,0,1,1,2,40,1,0,1,0,1,1,2,34,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-09-45-51,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,158,280,true,43,197,true,50,159,true,48,149,true,42,88,true,47,78,true,3754269.869999999,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-09-45-52,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,99,250,true,68,291,true,77,243,true,51,272,true,130,295,true,103,217,true,8614715.24,6382704.29,6382704.29,6382704.29,6382704.290000001,6382704.290000001,6382704.290000001
-2018-01-16-09-45-54,1,1,0,1,1,2,40,1,75,1,0,1,1,2,8,263,582,true,110,520,true,112,427,true,141,319,true,170,344,true,124,291,true,1.1206278750000002E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-09-45-58,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,217,831,true,216,846,true,265,928,true,189,484,true,273,448,true,281,447,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-54-45.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-54-45.csv
deleted file mode 100644
index 02b42c54391adcc8fcd1cd5f6c366793d3e4a9f1..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-09-54-45.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-09-54-45,1,1,0,1,1,2,40,1,0,1,0,1,1,2,29,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-09-54-45,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,118,276,true,46,191,true,31,131,true,20,93,true,36,72,true,82,111,true,3754269.869999999,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-09-54-46,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,68,300,true,66,323,true,50,197,true,68,184,true,89,253,true,168,281,true,8614715.24,6382704.29,6382704.29,6382704.29,6382704.290000001,6382704.290000001,6382704.290000001
-2018-01-16-09-54-48,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,272,605,true,138,526,true,103,440,true,126,339,true,232,355,true,148,316,true,1.1206278750000002E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-09-54-52,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,210,813,true,207,860,true,288,950,true,210,488,true,218,486,true,280,460,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-21-00.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-21-00.csv
deleted file mode 100644
index 0861eca6f9190333cda258a9c32c25721131923a..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-21-00.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-21-00,1,1,0,1,1,2,40,1,0,1,0,1,1,2,39,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-21-00,1,1,0,1,1,2,40,1,25,1,0,1,1,2,10,155,375,true,38,145,true,43,151,true,27,110,true,21,69,true,56,78,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-21-02,1,1,0,1,1,2,40,1,50,1,0,1,1,2,15,93,260,true,93,211,true,48,222,true,46,139,true,77,265,true,126,185,true,8614715.240000004,6382704.29,6382704.29,6382704.29,6382704.290000001,6382704.290000001,6382704.290000001
-2018-01-16-10-21-04,1,1,0,1,1,2,40,1,75,1,0,1,1,2,23,264,531,true,170,664,true,112,477,true,150,455,true,255,393,true,190,306,true,1.1206278750000002E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-21-08,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,198,756,true,239,762,true,185,859,true,179,462,true,248,451,true,236,465,true,1.4461749410000002E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-22-36.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-22-36.csv
deleted file mode 100644
index 15ff47f4cb8fdb07c4627af65387b40dba020055..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-22-36.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-22-36,1,1,0,1,1,2,40,1,0,1,0,1,1,2,36,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-22-36,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,133,264,true,36,163,true,23,107,true,34,53,true,23,38,true,32,39,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-22-37,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,58,267,true,49,270,true,45,187,true,46,91,true,56,101,true,59,79,true,8614715.240000002,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29
-2018-01-16-10-22-38,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,170,534,true,127,505,true,102,426,true,171,258,true,273,318,true,150,175,true,1.1206278749999996E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-22-41,1,1,0,1,1,2,40,1,100,1,0,1,1,2,7,199,803,true,202,833,true,255,786,true,178,311,true,194,317,true,208,310,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-29-55.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-29-55.csv
deleted file mode 100644
index 4c06b2d9c050bcff951cd05b8be5e4224ccac516..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-29-55.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-29-55,1,1,0,1,1,2,40,1,0,1,0,1,1,2,36,5,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-29-55,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,5,20,132,299,true,40,137,true,21,116,true,35,64,true,23,42,true,35,40,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-29-56,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,5,20,65,233,true,47,290,true,60,208,true,44,82,true,49,99,true,49,69,true,8614715.240000002,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29
-2018-01-16-10-29-57,1,1,0,1,1,2,40,1,75,1,0,1,1,2,3,5,20,156,547,true,105,532,true,178,487,true,117,231,true,160,321,true,174,174,true,1.1206278749999996E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-30-00,1,1,0,1,1,2,40,1,100,1,0,1,1,2,4,5,20,187,806,true,184,798,true,252,776,true,178,310,true,190,309,true,209,309,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-32-10.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-32-10.csv
deleted file mode 100644
index 04fe37a65d980b52da5c955edfc91f75593da9cb..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-32-10.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-32-10,1,1,0,1,1,2,40,1,0,1,0,1,1,2,33,15,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-32-10,1,1,0,1,1,2,40,1,25,1,0,1,1,2,10,15,20,185,243,true,25,144,true,37,136,true,32,64,true,20,40,true,26,56,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-32-11,1,1,0,1,1,2,40,1,50,1,0,1,1,2,6,15,20,75,261,true,51,233,true,87,212,true,43,74,true,55,94,true,72,102,true,8614715.240000002,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29
-2018-01-16-10-32-12,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,15,20,125,574,true,95,403,true,119,420,true,133,182,true,141,245,true,175,167,true,1.1206278749999996E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-32-15,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,15,20,191,782,true,184,752,true,211,890,true,175,309,true,187,307,true,190,345,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-41-51.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-41-51.csv
deleted file mode 100644
index 3f898ab538c796f5d1952e9e507c94203c40005c..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-41-51.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-41-51,1,1,0,1,1,2,40,1,0,1,0,1,1,2,32,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-41-51,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,100,20,129,284,true,45,157,true,37,120,true,25,47,true,24,40,true,32,36,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-41-52,1,1,0,1,1,2,40,1,50,1,0,1,1,2,10,100,20,59,249,true,46,257,true,47,189,true,47,88,true,55,114,true,79,119,true,8614715.240000002,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29
-2018-01-16-10-41-54,1,1,0,1,1,2,40,1,75,1,0,1,1,2,19,100,20,198,539,true,104,504,true,144,496,true,177,272,true,249,248,true,167,189,true,1.1206278749999996E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-41-57,1,1,0,1,1,2,40,1,100,1,0,1,1,2,4,100,20,207,821,true,189,809,true,262,786,true,178,310,true,190,316,true,205,311,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-52-00.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-52-00.csv
deleted file mode 100644
index 947aa246c2c9348d4f74ad9dbfd69c5c7de82797..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-52-00.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-52-00,1,1,0,1,1,2,40,1,0,1,0,1,1,2,29,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-52-00,1,1,0,1,1,2,40,1,25,1,0,1,1,2,8,100,20,128,272,true,36,164,true,23,130,true,34,68,true,25,42,true,40,38,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2,2809811.2
-2018-01-16-10-52-01,1,1,0,1,1,2,40,1,50,1,0,1,1,2,3,100,20,62,237,true,48,298,true,50,216,true,44,83,true,59,89,true,57,99,true,8614715.240000002,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29,6382704.29
-2018-01-16-10-52-03,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,100,20,154,554,true,103,463,true,114,435,true,120,217,true,151,206,true,104,176,true,1.1206278749999996E7,7289379.27,7289379.27,7289379.27,7289379.270000001,7289379.270000001,7289379.270000001
-2018-01-16-10-52-05,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,100,20,210,822,true,203,808,true,258,792,true,183,313,true,185,312,true,198,317,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-58-41.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-58-41.csv
deleted file mode 100644
index 951a38bb3239535fd0dda76a756ca3f618d64c1d..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-10-58-41.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-10-58-41,1,1,0,1,1,2,40,1,0,1,0,1,1,2,28,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-10-58-41,1,1,0,1,1,2,40,1,25,1,0,1,1,2,8,100,20,108,241,false,29,159,true,34,106,false,-1,-1,false,-1,-1,false,-1,-1,false,3754269.8699999996,0.0,2809811.2,0.0,0.0,0.0,0.0
-2018-01-16-10-58-42,1,1,0,1,1,2,40,1,50,1,0,1,1,2,11,100,20,67,270,false,69,283,true,55,215,false,-1,-1,false,-1,-1,false,-1,-1,false,8614715.240000002,0.0,6250091.81,0.0,0.0,0.0,0.0
-2018-01-16-10-58-43,1,1,0,1,1,2,40,1,75,1,0,1,1,2,5,100,20,166,492,false,110,508,true,118,414,false,-1,-1,false,-1,-1,false,-1,-1,false,1.1206278750000002E7,0.0,7279772.4,0.0,0.0,0.0,0.0
-2018-01-16-10-58-46,1,1,0,1,1,2,40,1,100,1,0,1,1,2,5,100,20,210,792,false,196,841,true,261,746,false,-1,-1,false,-1,-1,false,-1,-1,false,1.4461749410000004E7,0.0,9440690.9,0.0,0.0,0.0,0.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-15-47.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-15-47.csv
deleted file mode 100644
index 5f8a3c9b2a459064c39bf96cea6b2360c4ebd0eb..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-15-47.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-12-15-47,1,1,0,1,1,2,40,1,0,1,0,1,1,2,29,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-12-15-47,1,1,0,1,1,2,40,1,25,1,0,1,1,2,10,100,20,164,281,true,52,180,true,36,185,true,39,71,true,47,71,true,55,83,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.1999999997,2809811.1999999997,2809811.2
-2018-01-16-12-15-48,1,1,0,1,1,2,40,1,50,1,0,1,1,2,5,100,20,98,260,true,89,307,true,72,221,true,46,107,true,96,172,true,58,84,true,8614715.240000002,6250091.81,6250091.81,6250091.81,6250091.810000001,6250091.810000001,6250091.810000001
-2018-01-16-12-15-50,1,1,0,1,1,2,40,1,75,1,0,1,1,2,6,100,20,188,580,true,105,480,true,195,481,true,181,221,true,178,347,true,130,227,true,1.1206278749999996E7,7279772.4,7279772.4,7279772.4,7279772.400000001,7279772.400000001,7279772.400000001
-2018-01-16-12-15-53,1,1,0,1,1,2,40,1,100,1,0,1,1,2,6,100,20,204,863,true,233,778,true,258,871,true,190,325,true,220,320,true,204,327,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-19-37.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-19-37.csv
deleted file mode 100644
index ce9d3697ee89b3bedc689afd18270913553d59b5..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-12-19-37.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-12-19-37,1,1,0,1,1,2,40,1,0,1,0,1,1,2,30,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-12-19-37,1,1,0,1,1,2,40,1,25,1,0,1,1,2,9,100,20,159,272,true,45,171,true,27,132,true,38,46,true,25,48,true,27,59,true,3754269.8699999996,2809811.2,2809811.2,2809811.2,2809811.1999999997,2809811.1999999997,2809811.2
-2018-01-16-12-19-38,1,1,0,1,1,2,40,1,50,1,0,1,1,2,6,100,20,61,240,true,63,261,true,90,219,true,53,87,true,57,144,true,71,118,true,8614715.240000002,6250091.81,6250091.81,6250091.81,6250091.810000001,6250091.810000001,6250091.810000001
-2018-01-16-12-19-40,1,1,0,1,1,2,40,1,75,1,0,1,1,2,6,100,20,172,585,true,113,489,true,183,423,true,134,266,true,188,302,true,184,190,true,1.1206278749999996E7,7279772.4,7279772.4,7279772.4,7279772.400000001,7279772.400000001,7279772.400000001
-2018-01-16-12-19-43,1,1,0,1,1,2,40,1,100,1,0,1,1,2,8,100,20,198,804,true,190,766,true,262,866,true,178,316,true,189,310,true,184,328,true,1.4461749410000008E7,9440690.9,9440690.9,9440690.9,9440690.900000004,9440690.900000004,9440690.900000004
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-56-06.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-56-06.csv
deleted file mode 100644
index 8b81f9866aceec9432c7e29e131bb4c570478897..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-56-06.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-13-56-06,1,1,0,1,3,2,40,1,0,1,0,1,3,6,33,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-13-56-06,1,1,0,1,3,2,40,1,25,1,0,1,3,6,9,100,20,338,544,true,68,335,true,64,315,true,144,163,true,63,124,true,112,130,true,3798531.44,2509547.62,2509547.62,2509547.62,2509547.62,2509547.62,2509547.62
-2018-01-16-13-56-09,1,1,0,1,3,2,40,1,50,1,0,1,3,6,12,100,20,201,821,true,164,644,true,170,747,true,194,703,true,161,719,true,190,761,true,8982037.919999998,5464938.59,5548427.75,5406579.61,5395088.479999999,5406579.610000001,5395088.4799999995
-2018-01-16-13-56-14,1,1,0,1,3,2,40,1,75,1,0,1,3,6,4,100,20,367,1560,true,341,1590,true,340,1384,true,355,656,true,476,650,true,362,607,true,1.1645878680000002E7,7882095.92,7882095.92,7882095.92,7882095.919999997,7882095.919999997,7882095.919999997
-2018-01-16-13-56-23,1,1,0,1,3,2,40,1,100,1,0,1,3,6,5,100,20,655,3028,true,621,2679,true,622,2944,true,629,1123,true,710,1114,true,731,1097,true,1.4230622959999999E7,9257569.34,9257569.34,9257569.34,9257569.34,9257569.34,9257569.34
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-59-45.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-59-45.csv
deleted file mode 100644
index 9d9ea8644a1bfc6d630d53158065c9e080dfa701..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-16-13-59-45.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-16-13-59-45,1,1,0,1,3,2,40,1,0,1,0,1,3,6,37,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-16-13-59-45,1,1,0,1,3,2,40,1,25,1,0,1,3,6,10,100,20,275,525,true,85,349,true,112,396,true,64,105,true,123,83,true,63,107,true,3798531.4400000004,2509547.62,2509547.62,2509547.62,2509547.6200000006,2509547.6200000006,2509547.620000001
-2018-01-16-13-59-47,1,1,0,1,3,2,40,1,50,1,0,1,3,6,3,100,20,246,741,true,175,703,true,165,743,true,210,2154,true,142,8545,true,145,538,true,8982037.919999998,5464938.59,5548427.75,5406579.61,5464938.589999999,5548427.75,5406579.609999999
-2018-01-16-14-00-02,1,1,0,1,3,2,40,1,75,1,0,1,3,6,4,100,20,402,1419,true,407,1312,true,367,1351,true,401,716,true,397,1008,true,363,702,true,1.164587868E7,7882095.92,7882095.92,7882095.92,7882095.919999997,7882095.919999999,7882095.919999996
-2018-01-16-14-00-11,1,1,0,1,3,2,40,1,100,1,0,1,3,6,2,100,20,746,2919,true,708,2955,true,680,3065,true,638,1109,true,699,1118,true,698,1069,true,1.423062296E7,9257569.34,9257569.34,9257569.34,9257569.339999996,9257569.339999998,9257569.34
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-17-10-56-22.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-17-10-56-22.csv
deleted file mode 100644
index 2edf4c4e74277d4a6ca460f1ac750b409e9db2a0..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-17-10-56-22.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-timestamp,topLevelComponents,avgSubComponents,subComponentStdDerivation,componentDepth,implementations,modes,computeResources,nonfunctionalProperties,requests,cpus,seed,genComponents,genImplementations,genConfigurations,modelGeneration,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy
-2018-01-17-10-56-22,1,1,0,1,3,2,40,1,0,1,0,1,3,6,35,100,20,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0,0,true,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-17-10-56-22,1,1,0,1,3,2,40,1,25,1,0,1,3,6,9,100,20,252,563,true,116,358,true,64,314,true,117,105,true,69,125,true,105,106,true,3798531.4399999995,2509547.62,2509547.62,2509547.62,2509547.6200000006,2509547.6200000006,2509547.620000001
-2018-01-17-10-56-24,1,1,0,1,3,2,40,1,50,1,0,1,3,6,5,100,20,197,785,true,158,762,true,154,786,true,174,2364,true,156,10378,true,198,706,true,8982037.920000002,5464938.59,5548427.75,5406579.61,5464938.59,5548427.749999998,5406579.61
-2018-01-17-10-56-41,1,1,0,1,3,2,40,1,75,1,0,1,3,6,3,100,20,362,1648,true,365,1576,true,346,1383,true,362,589,true,405,651,true,353,675,true,1.1645878679999998E7,7882095.92,7882095.92,7882095.92,7882095.919999998,7882095.919999999,7882095.919999997
-2018-01-17-10-56-50,1,1,0,1,3,2,40,1,100,1,0,1,3,6,5,100,20,655,2918,true,624,2522,true,654,2502,true,680,1119,true,635,1089,true,633,1133,true,1.4230622959999999E7,9257569.34,9257569.34,9257569.34,9257569.339999998,9257569.339999998,9257569.339999996
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-17-23.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-17-23.csv
deleted file mode 100644
index 380029b651d902e656c7ee7b1646b8994278b8b9..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-17-23.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGeneration0,ilp-externalSolving0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenerationHard,ilp-externalSolvingHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenerationEasy,ilp-externalSolvingEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGeneration0,ilp-directSolving0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenerationHard,ilp-directSolvingHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenerationEasy,ilp-directSolvingEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolving0,simpleValid0,simpleTimeOut0,simpleSolvingHard,simpleValidHard,simpleTimeOutHard,simpleSolvingEasy,simpleValidEasy,simpleTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy
-2018-01-18-16-17-23,1,1,0,1,3,2,40,1,0,1,0,1,3,6,32,100,20,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-18-16-17-23,1,1,0,1,3,2,40,1,1,1,0,1,3,6,16,100,20,62,101,true,false,9,44,true,false,17,27,true,false,6,34,true,false,6,8,true,false,5,9,true,false,5,true,false,3,true,false,7,true,false,345548.75,131274.92,131274.92,131274.92,131274.91999999998,131274.91999999998,131274.91999999998,131274.92,131274.92,131274.92
-2018-01-18-16-17-23,1,1,0,1,3,2,40,1,2,1,0,1,3,6,1,100,20,17,62,true,false,20,61,true,false,10,43,true,false,12,18,true,false,13,50,true,false,23,58,true,false,16,true,false,18,true,false,19,true,false,580734.28,361218.02,361218.02,296864.57,361218.02,361218.02,296864.56999999995,361218.02,361218.02,296864.57
-2018-01-18-16-17-24,1,1,0,1,3,2,40,1,3,1,0,1,3,6,1,100,20,41,70,true,false,20,63,true,false,24,48,true,false,12,18,true,false,15,19,true,false,8,11,true,false,57,true,false,43,true,false,64,true,false,693341.58,367752.27,367752.27,302788.86,367752.26999999996,367752.26999999996,302788.8599999999,367752.26999999996,367752.26999999996,302788.86
-2018-01-18-16-17-24,1,1,0,1,3,2,40,1,4,1,0,1,3,6,1,100,20,21,103,true,false,30,58,true,false,13,42,true,false,27,19,true,false,27,26,true,false,21,12,true,false,1207,true,false,707,true,false,866,true,false,801741.8099999999,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-38-48.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-38-48.csv
deleted file mode 100644
index 792ecf28a15f15c3377f52506645a72809fd05f4..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-18-16-38-48.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy
-2018-01-18-16-38-48,1,1,0,1,3,2,40,1,0,1,0,1,3,6,36,100,20,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-18-16-38-48,1,1,0,1,3,2,40,1,1,1,0,1,3,6,5,100,20,46,135,true,false,10,60,true,false,7,33,true,false,6,19,true,false,5,7,true,false,5,7,true,false,4,true,false,3,true,false,2,true,false,345548.75,131274.92,131274.92,131274.92,131274.91999999998,131274.91999999998,131274.91999999998,131274.92,131274.92,131274.92
-2018-01-18-16-38-48,1,1,0,1,3,2,40,1,2,1,0,1,3,6,1,100,20,11,42,true,false,12,47,true,false,7,36,true,false,10,17,true,false,10,15,true,false,8,16,true,false,8,true,false,8,true,false,11,true,false,580734.28,361218.02,361218.02,296864.57,361218.02,361218.02,296864.56999999995,361218.02,361218.02,296864.57
-2018-01-18-16-38-49,1,1,0,1,3,2,40,1,3,1,0,1,3,6,1,100,20,28,55,true,false,12,47,true,false,11,74,true,false,11,18,true,false,13,15,true,false,7,11,true,false,49,true,false,37,true,false,70,true,false,693341.58,367752.27,367752.27,302788.86,367752.26999999996,367752.26999999996,302788.8599999999,367752.26999999996,367752.26999999996,302788.86
-2018-01-18-16-38-49,1,1,0,1,3,2,40,1,4,1,0,1,3,6,1,100,20,28,69,true,false,33,61,true,false,30,60,true,false,16,22,true,false,15,24,true,false,13,30,true,false,1174,true,false,589,true,false,822,true,false,801741.8099999999,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98,459241.98
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-13-55-30.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-13-55-30.csv
deleted file mode 100644
index e0a71ed86d8a9b7c81b4d08b7823f575b8b8492d..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-13-55-30.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-13-55-30,1,1,0,1,3,2,1.0,1,0,1,0,1,3,6,27,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,5,0,true,false,0,0,true,false,0,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-13-55-30,1,1,0,1,3,2,1.0,1,1,1,0,1,3,6,3,100,25,8,38,true,false,2,11,true,false,1,7,true,false,1,14,true,false,0,4,true,false,1,3,true,false,2,true,false,1,true,false,1,true,false,0,0,false,false,0,0,true,false,0,0,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,-5707.0,-5707.0,-17455.0
-2018-01-19-13-55-45,1,1,0,1,3,2,1.0,1,2,1,0,1,3,6,0,100,25,1,11,true,false,2,14,true,false,1,11,true,false,1,3,true,false,5,3,true,false,1,2,true,false,7,true,false,4,true,false,3,true,false,0,0,false,false,0,0,false,false,0,0,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,-406855.0,-151820.0,-325456.0
-2018-01-19-13-56-00,1,1,0,1,3,2,1.0,1,3,1,0,1,3,6,0,100,25,2,23,true,false,9,16,true,false,2,35,true,false,2,11,true,false,2,2,true,false,4,2,true,false,9,true,false,6,true,false,6,true,false,0,0,false,false,0,0,false,false,0,0,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,-194354.0,-361607.0,-335866.0
-2018-01-19-13-56-15,1,1,0,1,3,2,1.0,1,4,1,0,1,3,6,0,100,25,2,14,true,false,3,14,true,false,1,21,true,false,2,4,true,false,2,5,true,false,3,4,true,false,85,true,false,36,true,false,68,true,false,0,0,false,false,0,0,false,false,0,0,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,-179125.0,-188436.0,-213464.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-15-55-54.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-15-55-54.csv
deleted file mode 100644
index e6eec3da8ba9fd09c7a421d01dc2f93c0e5278ed..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-15-55-54.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-15-55-54,1,1,0,1,3,2,1.0,1,0,1,0,1,3,6,25,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,5,0,true,false,0,0,true,false,0,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-15-55-55,1,1,0,1,3,2,1.0,1,1,1,0,1,3,6,3,100,25,12,34,true,false,2,10,true,false,1,10,true,false,1,14,true,false,1,1,true,false,0,1,true,false,3,true,false,1,true,false,1,true,false,0,0,true,false,0,0,false,false,0,0,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,-5707.0,-44193.0,-17455.0
-2018-01-19-15-56-10,1,1,0,1,3,2,1.0,1,2,1,0,1,3,6,0,100,25,2,12,true,false,1,14,true,false,1,16,true,false,2,3,true,false,1,3,true,false,1,3,true,false,8,true,false,6,true,false,3,true,false,0,0,false,false,0,0,false,false,0,0,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,-400601.0,-380368.0,-131587.0
-2018-01-19-15-56-25,1,1,0,1,3,2,1.0,1,3,1,0,1,3,6,0,100,25,2,21,true,false,2,12,true,false,1,27,true,false,2,4,true,false,2,3,true,false,2,3,true,false,9,true,false,8,true,false,7,true,false,0,0,false,false,0,0,false,false,0,0,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,-161894.0,-93429.0,-93429.0
-2018-01-19-15-56-40,1,1,0,1,3,2,1.0,1,4,1,0,1,3,6,0,100,25,2,24,true,false,4,12,true,false,2,13,true,false,3,4,true,false,2,5,true,false,2,13,true,false,67,true,false,33,true,false,81,true,false,0,0,false,false,0,0,false,false,0,0,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,-251521.0,-210789.0,-147844.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-10-30.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-10-30.csv
deleted file mode 100644
index 0370837d2b5be4b8203ed677902f1eb13ab130a3..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-10-30.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-17-10-30,1,1,0,1,3,2,1.0,1,0,1,0,1,3,6,31,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,7,0,true,false,0,0,true,false,0,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-17-10-30,1,1,0,1,3,2,1.0,1,1,1,0,1,3,6,7,100,25,12,39,true,false,2,10,true,false,2,6,true,false,0,10,true,false,0,1,true,false,1,2,true,false,2,true,false,1,true,false,1,true,false,0,0,false,false,0,0,true,false,0,0,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,-44193.0,-5707.0,-5707.0
-2018-01-19-17-11-30,1,1,0,1,3,2,1.0,1,2,1,0,1,3,6,0,100,25,1,7,true,false,1,13,true,false,1,12,true,false,1,5,true,false,1,3,true,false,1,3,true,false,5,true,false,3,true,false,3,true,false,0,0,false,false,0,0,false,false,0,0,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,-74085.0,-377577.0,-154035.0
-2018-01-19-17-12-31,1,1,0,1,3,2,1.0,1,3,1,0,1,3,6,0,100,25,2,16,true,false,4,14,true,false,2,14,true,false,2,2,true,false,2,3,true,false,1,3,true,false,7,true,false,6,true,false,6,true,false,0,0,false,false,0,0,false,false,0,0,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,-319188.0,-73438.0,-161894.0
-2018-01-19-17-13-31,1,1,0,1,3,2,1.0,1,4,1,0,1,3,6,1,100,25,3,18,true,false,2,15,true,false,2,12,true,false,2,4,true,false,2,4,true,false,2,5,true,false,110,true,false,62,true,false,98,true,false,0,0,false,false,0,0,false,false,0,0,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,-209585.0,-538480.0,-432826.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-50-04.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-50-04.csv
deleted file mode 100644
index 5f6f6ff433d7c44cff20ece2efea6cc0a8c83f37..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-17-50-04.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-17-50-04,1,1,0,1,3,2,1.0,1,0,1,0,1,3,6,26,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,6,31,true,false,0,2,true,false,0,1,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-17-50-04,1,1,0,1,3,2,1.0,1,1,1,0,1,3,6,6,100,25,11,35,true,false,1,10,true,false,2,6,true,false,9,2,true,false,2,1,true,false,2,0,true,false,2,true,false,1,true,false,1,true,false,0,20007,false,false,1,20001,false,false,0,20001,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,37422.0,17455.0,44193.0
-2018-01-19-17-51-04,1,1,0,1,3,2,1.0,1,2,1,0,1,3,6,0,100,25,2,13,true,false,1,14,true,false,1,12,true,false,2,4,true,false,2,1,true,false,2,0,true,false,6,true,false,4,true,false,3,true,false,0,20000,false,false,0,20000,false,false,0,20000,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,42126.0,325456.0,131587.0
-2018-01-19-17-52-04,1,1,0,1,3,2,1.0,1,3,1,0,1,3,6,1,100,25,2,11,true,false,2,14,true,false,1,12,true,false,4,1,true,false,2,0,true,false,2,0,true,false,8,true,false,6,true,false,5,true,false,0,20000,false,false,0,20000,false,false,0,20000,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,93429.0,319188.0,414196.0
-2018-01-19-17-53-05,1,1,0,1,3,2,1.0,1,4,1,0,1,3,6,0,100,25,2,12,true,false,2,12,true,false,2,13,true,false,8,4,true,false,4,2,true,false,3,1,true,false,66,true,false,30,true,false,77,true,false,0,20000,false,false,0,20001,false,false,0,20000,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,304857.0,417131.0,501766.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-26-59.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-26-59.csv
deleted file mode 100644
index 56297880ee13704de0acfa38e4b8b0638728f4e5..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-26-59.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-18-26-59,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,37,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,5,26,true,false,0,1,true,false,0,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-18-27-00,1,1,0,1,3,2,1.5,1,1,1,0,1,3,6,3,100,25,11,37,true,false,5,12,true,false,1,10,true,false,11,2,true,false,0,0,true,false,0,0,true,false,2,true,false,1,true,false,2,true,false,0,20007,false,false,0,20001,false,false,0,20000,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,37422.0,37422.0,44457.0
-2018-01-19-18-28-00,1,1,0,1,3,2,1.5,1,2,1,0,1,3,6,0,100,25,1,11,true,false,2,19,true,false,2,16,true,false,3,3,true,false,2,1,true,false,2,2,true,false,7,true,false,5,true,false,3,true,false,0,20000,false,false,0,20000,false,false,0,20001,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,51061.0,316713.0,54109.0
-2018-01-19-18-29-00,1,1,0,1,3,2,1.5,1,3,1,0,1,3,6,0,100,25,3,19,true,false,3,16,true,false,2,13,true,false,5,0,true,false,5,0,true,false,4,0,true,false,8,true,false,6,true,false,5,true,false,0,20001,false,false,0,20001,false,false,0,20000,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,347410.0,186710.0,420915.0
-2018-01-19-18-30-00,1,1,0,1,3,2,1.5,1,4,1,0,1,3,6,0,100,25,2,13,true,false,5,19,true,false,3,10,true,false,9,0,true,false,6,0,true,false,4,0,true,false,107,true,false,42,true,false,83,true,false,0,20001,false,false,0,20000,false,false,0,20000,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,102415.0,184056.0,189970.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-32-07.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-32-07.csv
deleted file mode 100644
index bc57606707aa5532d7bd272902084bafa2cf9c9e..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-32-07.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-18-32-07,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,30,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,5,22,true,false,0,1,true,false,0,1,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-18-32-07,1,1,0,1,3,2,1.5,1,1,1,0,1,3,6,7,100,25,13,44,true,false,2,12,true,false,2,12,true,false,10,2,true,false,1,0,true,false,1,0,true,false,4,true,false,1,true,false,1,true,false,0,60001,false,false,0,59999,false,false,0,59999,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,44457.0,5707.0,37422.0
-2018-01-19-18-35-08,1,1,0,1,3,2,1.5,1,2,1,0,1,3,6,0,100,25,1,18,true,false,3,21,true,false,3,13,true,false,4,1,true,false,4,1,true,false,3,1,true,false,13,true,false,8,true,false,7,true,false,0,59999,false,false,0,59999,false,false,0,59999,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,406855.0,158074.0,51061.0
-2018-01-19-18-38-08,1,1,0,1,3,2,1.5,1,3,1,0,1,3,6,1,100,25,3,23,true,false,3,16,true,false,2,14,true,false,5,1,true,false,5,1,true,false,5,4,true,false,8,true,false,6,true,false,6,true,false,0,59999,false,false,0,59999,false,false,0,60000,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,368326.0,172513.0,93243.0
-2018-01-19-18-41-08,1,1,0,1,3,2,1.5,1,4,1,0,1,3,6,0,100,25,2,13,true,false,3,16,true,false,2,12,true,false,4,0,true,false,4,0,true,false,5,1,true,false,100,true,false,40,true,false,73,true,false,0,59999,false,false,0,60000,false,false,0,59999,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,227780.0,219105.0,483999.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-46-49.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-46-49.csv
deleted file mode 100644
index 182a6e01afd7a39c49f9da3e315cb0d62ea85335..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-46-49.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-18-46-49,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,26,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,7,25,true,false,0,1,true,false,0,1,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-48-23.csv b/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-48-23.csv
deleted file mode 100644
index 73dee14e37b946df4ef2be96366412a7701c2206..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/inc-benchmark-2018-01-19-18-48-23.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-19-18-48-23,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,28,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,5,28,true,false,0,3,true,false,0,1,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-19-18-48-23,1,1,0,1,3,2,1.5,1,1,1,0,1,3,6,6,100,25,16,37,true,false,3,10,true,false,2,7,true,false,12,4,true,false,2,0,true,false,0,0,true,false,2,true,false,3,true,false,2,true,false,0,10000,false,false,0,9999,false,false,0,9999,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.0,37422.0,5707.0
-2018-01-19-18-48-53,1,1,0,1,3,2,1.5,1,2,1,0,1,3,6,2,100,25,2,12,true,false,2,15,true,false,2,12,true,false,3,2,true,false,3,1,true,false,3,1,true,false,8,true,false,8,true,false,4,true,false,0,10000,false,false,0,10000,false,false,0,10000,false,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,316713.0,74277.0,42126.0
-2018-01-19-18-49-24,1,1,0,1,3,2,1.5,1,3,1,0,1,3,6,0,100,25,2,20,true,false,5,20,true,false,2,15,true,false,5,0,true,false,5,0,true,false,5,0,true,false,8,true,false,6,true,false,5,true,false,0,10000,false,false,0,9999,false,false,0,10000,false,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,305746.44999999995,305746.44999999995,305746.44999999995,99967.0,93243.0,93243.0
-2018-01-19-18-49-54,1,1,0,1,3,2,1.5,1,4,1,0,1,3,6,0,100,25,2,13,true,false,2,11,true,false,2,9,true,false,4,0,true,false,4,0,true,false,5,0,true,false,104,true,false,51,true,false,88,true,false,0,9999,false,false,0,9999,false,false,0,9999,false,false,155750.37,75180.08,109479.6,75180.08,75180.08,109479.59999999999,75180.08,75180.08,109479.59999999999,75180.08,301861.0,460829.0,193712.0
diff --git a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-50-16.csv b/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-50-16.csv
deleted file mode 100644
index d5ccc5e84ad1b6d9d5ddba1e9f79495d84691320..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-50-16.csv
+++ /dev/null
@@ -1 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
diff --git a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-56-31.csv b/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-56-31.csv
deleted file mode 100644
index 28cb1b79bb635f9ea8c2fd9641afa6bb401ce6a4..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-14-56-31.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,initialObjective,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy
-2018-01-22-14-56-31,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,22,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,true,false,0,true,false,0,true,false,8,30,true,false,0,1,true,false,0,1,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-22-14-56-31,1,1,0,1,3,2,1.5,1,1,1,0,1,3,6,5,100,25,11,36,true,false,2,9,true,false,2,10,true,false,15,3,true,false,2,0,true,false,2,0,true,false,3,true,false,3,true,false,3,true,false,0,10000,false,false,0,9999,false,false,0,10000,false,false,5707.990000000001,5707.99,5707.99,5707.99,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,44457.0,44457.0,37422.0
diff --git a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-15-09-17.csv b/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-15-09-17.csv
deleted file mode 100644
index d9986d0f8c91d00ae72cc559fec4af8fc24522e2..0000000000000000000000000000000000000000
--- a/jastadd-mquat-benchmark/old-results/incremental/benchmark-2018-01-22-15-09-17.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-when,tlc,asc,std,dep,bi,bm,res,nfp,req,cpu,seed,comp,impl,conf,gen,reqToChange,percentToChange,ilp-directGen0,ilp-directSolved0,ilp-directValid0,ilp-directTimeOut0,ilp-directGenHard,ilp-directSolvedHard,ilp-directValidHard,ilp-directTimeOutHard,ilp-directGenEasy,ilp-directSolvedEasy,ilp-directValidEasy,ilp-directTimeOutEasy,ilp-externalGen0,ilp-externalSolved0,ilp-externalValid0,ilp-externalTimeOut0,ilp-externalGenHard,ilp-externalSolvedHard,ilp-externalValidHard,ilp-externalTimeOutHard,ilp-externalGenEasy,ilp-externalSolvedEasy,ilp-externalValidEasy,ilp-externalTimeOutEasy,mh-naiveGen0,mh-naiveSolved0,mh-naiveValid0,mh-naiveTimeOut0,mh-naiveGenHard,mh-naiveSolvedHard,mh-naiveValidHard,mh-naiveTimeOutHard,mh-naiveGenEasy,mh-naiveSolvedEasy,mh-naiveValidEasy,mh-naiveTimeOutEasy,simpleSolved0,simpleValid0,simpleTimeOut0,simpleSolvedHard,simpleValidHard,simpleTimeOutHard,simpleSolvedEasy,simpleValidEasy,simpleTimeOutEasy,initialObjective,ilp-directObjective0,ilp-directObjectiveHard,ilp-directObjectiveEasy,ilp-externalObjective0,ilp-externalObjectiveHard,ilp-externalObjectiveEasy,mh-naiveObjective0,mh-naiveObjectiveHard,mh-naiveObjectiveEasy,simpleObjective0,simpleObjectiveHard,simpleObjectiveEasy
-2018-01-22-15-09-17,1,1,0,1,3,2,1.5,1,0,1,0,1,3,6,25,100,25,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,0,0,true,false,6,22,true,false,0,1,true,false,0,1,true,false,0,true,false,0,true,false,0,true,false,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2018-01-22-15-09-17,1,1,0,1,3,2,1.5,1,1,1,0,1,3,6,11,100,25,27,3,true,false,7,2,true,false,4,3,true,false,2,34,true,false,2,8,true,false,1,6,true,false,0,10001,false,false,0,9999,false,false,0,10000,false,false,1,true,false,2,true,false,2,true,false,5707.990000000001,5707.990000000001,5707.990000000001,5707.990000000001,5707.99,5707.99,5707.99,44457.0,37422.0,17455.0,5707.990000000001,5707.990000000001,5707.990000000001
-2018-01-22-15-09-47,1,1,0,1,3,2,1.5,1,2,1,0,1,3,6,1,100,25,3,2,true,false,4,2,true,false,3,0,true,false,1,15,true,false,2,14,true,false,1,12,true,false,0,10000,false,false,0,10000,false,false,2,10000,false,false,5,true,false,4,true,false,3,true,false,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.79,128796.0,131844.0,142566.0,128796.79,128796.79,128796.79
-2018-01-22-15-10-17,1,1,0,1,3,2,1.5,1,3,1,0,1,3,6,0,100,25,6,0,true,false,6,0,true,false,5,0,true,false,2,21,true,false,2,16,true,false,2,15,true,false,0,10000,false,false,0,9999,false,false,0,9999,false,false,7,true,false,6,true,false,5,true,false,305746.44999999995,305746.45,305746.45,305746.45,305746.45,305746.45,305746.45,427639.0,193429.0,160784.0,305746.44999999995,305746.44999999995,305746.44999999995
-2018-01-22-15-10-47,1,1,0,1,3,2,1.5,1,4,1,0,1,3,6,0,100,25,7,0,true,false,5,0,true,false,6,0,true,false,3,21,true,false,4,17,true,false,3,20,true,false,0,9999,false,false,0,10000,false,false,0,9999,false,false,53,true,false,25,true,false,54,true,false,155750.37,75180.08,109479.59999999999,75180.08,75180.08,109479.6,75180.08,218606.0,292426.0,178276.0,75180.08,109479.59999999999,75180.08