merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/helix/calculators/calculator.py
+++ b/helix/calculators/calculator.py
@@ -1,4 +1,3 @@
-from math import ceil, floor
 import copy
 from helix.Repositories.graph_repository import GraphRepository
 from helix.calculators.ballast_calculator import BallastCalculator