Renamed folders and deleted unused logic files

sailbot-vt · Oct 29, 2015 · 176a5a7 · 176a5a7
1 parent 0c8ad5c
commit 176a5a7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 69 deletions.
diff --git a/src/modules/Logic/ShipData.py b/src/modules/Logic/ShipData.py
diff --git a/src/modules/Logic/calc.py b/src/modules/Logic/calc.py
diff --git a/src/modules/calc.py b/src/modules/calc.py
@@ -1,12 +1,5 @@
-#!/usr/bin/python
 import math
-
-""" The file contains help methods to logic functions.
-    These are object independent; they only need the data given as parameters
-    to return a result.
-"""
-
-point_proximity_radius = 5
+import ship_data
 
 def direction_to_point(current_point, target_point):
     a = math.radians(current_point['latitude'])
@@ -23,8 +16,8 @@ def get_heading_angle(heading, current_point, target_point):
 
     return heading - angle
 
-def point_proximity(current_point, target_point):
-    return (distance(current_point, target_point) <= point_proximity_radius)
+def within_radius_of_target(current_point, target_point):
+    return (distance(current_point, target_point) <= ship_data.point_proximity_radius)
 
 def distance(point1, point2):
     a = math.sin(math.radians(point1['latitude']))

diff --git a/src/modules/Logic/helmsman.py → src/modules/helmsman.py b/src/modules/Logic/helmsman.py → src/modules/helmsman.py
diff --git a/src/modules/Logic/main.py → src/modules/main.py b/src/modules/Logic/main.py → src/modules/main.py
diff --git a/src/modules/Logic/ship_data.py → src/modules/ship_data.py b/src/modules/Logic/ship_data.py → src/modules/ship_data.py
diff --git a/src/modules/Logic/utlity.py → src/modules/utlity.py b/src/modules/Logic/utlity.py → src/modules/utlity.py