From 0712acd1a6bbbbecd04eafd98f7f773698f80eaf Mon Sep 17 00:00:00 2001
From: HanEmile <emile.hansmaennel@gmail.com>
Date: Fri, 17 Mar 2017 22:14:09 +0100
Subject: bugfixes

---
 main2.py       |  80 ++++-----------------------------------------------------
 startup.blend  | Bin 406944 -> 403252 bytes
 startup.blend1 | Bin 406960 -> 406944 bytes
 3 files changed, 5 insertions(+), 75 deletions(-)

diff --git a/main2.py b/main2.py
index 29335d7..5cd0f4e 100644
--- a/main2.py
+++ b/main2.py
@@ -7,8 +7,8 @@ import numpy as np
 from timeit import default_timer as timer
 
 # import helper-modules
-# convert ploar to cartesian koordinates:
-import poltocart as ptc
+# convert polar to cartesian koordinates:
+# import poltocart as ptc
 
 class TLE:
     def get(value, category, satNr):
@@ -91,12 +91,12 @@ class TLE:
 start = timer()
 
 # controll values
-category = "argos"
+category = "dummy"
 globalScale = 1
 satSize = 0.5
 orbitSubDivs = 256
-resolution = 100        # get position of sat each x frames
-threshold = 0.001
+resolution = 1        # get position of sat each x frames
+threshold = 0.1
 
 # if internet connection available:
 # TLE.download(category)
@@ -277,76 +277,6 @@ plt.show()
 # create an array filled with 0
 # array[t, y, x]
 
-dure = int(duration/resolution)
-# dure = 5
-array = np.zeros((int(dure), numOfSat + 3, numOfSat + 3))
-
-satNr = 1
-
-print(dure)
-
-# for every moment in time
-for time in range(0, dure, 1):
-    x = 0
-    y = 0
-
-    for sat in range(0, numOfSat, 1):
-        array[time, y+0, sat+3] = xyz[sat][0][time]
-        array[time, y+1, sat+3] = xyz[sat][1][time]
-        array[time, y+2, sat+3] = xyz[sat][2][time]
-
-    for sat in range(0, numOfSat, 1):
-        array[time, sat+3, y+0] = xyz[sat][0][time]
-        array[time, sat+3, y+1] = xyz[sat][1][time]
-        array[time, sat+3, y+2] = xyz[sat][2][time]
-
-    # loop through array
-
-
-    for y in range(3, (numOfSat + 3), 1):
-        for x in range(3, (numOfSat + 3), 1):
-            if x != y:
-                a_x = array[time, 0, x]
-                a_y = array[time, 1, x]
-                a_z = array[time, 2, x]
-
-                b_x = array[time, y, 0]
-                b_y = array[time, y, 1]
-                b_z = array[time, y, 2]
-
-                a = pow((abs(a_x)-abs(b_x)), 2)
-                b = pow((abs(a_y)-abs(b_y)), 2)
-                c = pow((abs(a_z)-abs(b_z)), 2)
-
-                d = math.sqrt(a + b + c)
-                array[time, y, x] = d
-
-                # print Warning
-                if d < threshold:
-                    xname = TLE.get("name", category, x-3)
-                    yname = TLE.get("name", category, y-3)
-
-                    a_x = array[time, 0, x]
-                    a_y = array[time, 1, x]
-                    a_z = array[time, 2, x]
-
-                    b_x = array[time, y, 0]
-                    b_y = array[time, y, 1]
-                    b_z = array[time, y, 2]
-
-                    print("")
-                    print("BUM !!!")
-                    print("{:<20}{:<20}{:<10}{:<20}".format("sat A", "sat B", "time", "distance"))
-                    print("")
-                    print("{:<20}{:<20}{:<10}{:<20}".format(xname, yname, time, d))
-                    print("{:<30}{:<30}{:<30}".format(a_x, a_y, a_z))
-                    print("{:<30}{:<30}{:<30}".format(b_x, b_y, b_z))
-
-# print horizontal "line"
-print("{:#<80}".format("#"))
-# print array
-print(array)
-
 end = timer()
 
 print("")
diff --git a/startup.blend b/startup.blend
index 54d8c5f..99eca75 100644
Binary files a/startup.blend and b/startup.blend differ
diff --git a/startup.blend1 b/startup.blend1
index 6813ca4..54d8c5f 100644
Binary files a/startup.blend1 and b/startup.blend1 differ
-- 
cgit 1.4.1