From 50012de6c2fd3eae0aa04b7a2b4e497dc0bae27a Mon Sep 17 00:00:00 2001
From: hanemile <emile.hansmaennel@gmail.com>
Date: Tue, 16 Jan 2018 15:59:01 +0100
Subject: updated the source files

---
 src/python/coord.py | 50 ++++++++++++--------------------------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

(limited to 'src/python/coord.py')

diff --git a/src/python/coord.py b/src/python/coord.py
index d4bab31..b033f9d 100755
--- a/src/python/coord.py
+++ b/src/python/coord.py
@@ -9,22 +9,17 @@ from subprocess import call
 # define the number of stars that should be generated
 nos = int(sys.argv[1])
 
-# define some arrays for storing the values
-arr_stars = np.zeros((int(nos), 3))
-arr_saved_stars = np.zeros((int(nos), 3))
-
 # define various paths
 path = "data/2e7.csv"
 save_path = "stars/" + sys.argv[2] + ".csv"
-# star13 -> 586 stars
 
 # define the random-value range [rho_min; rho_max]
 rand_min = 0
 rand_max = 1477.1586582000994
 
 # define the range (size) of the galaxy
-range_min = -1e7
-range_max = 1e7
+range_min = -1e8
+range_max = -range_min
 
 # main function
 def main():
@@ -32,19 +27,16 @@ def main():
     # define the variables for storing the amount of stars kept or kicked away
     stars_kept = 0
     stars_kicked = 0
-    i = 0
 
     # start the timer
     start = time.time()
 
     # open the rho file
     with open(path) as data:
-
         # read out the lines from the rho file
         rho_file = data.readlines()
 
         # for every star...
-        # for i in range(0, nos):
         while(stars_kept < nos):
 
             # generate the random star-coordinates
@@ -54,22 +46,20 @@ def main():
 
             # calculate the distance of the star to the center of the galaxy
             r = np.sqrt(pow(x, 2) + pow(y, 2) + pow(z, 2))
-            # print(round(int(r), 0))
 
             # generate a random value in the range [rand_min; rand_max]
             a = np.random.uniform(rand_min, rand_max, size=1)
 
             # read out the corresponding rho value from the lookuptable (rho-file)
-            b = float(rho_file[round(int(r), 0)].split(", ")[1].strip("\n"))
+            b = float(rho_file[round(int(r / 10), 0)].split(", ")[1].strip("\n"))
 
             # if the random value is smaller than the corresponding rho value
             if(a < b):
-                # add the coordinate to arr_saved_stars
-                arr_saved_stars[stars_kept][0] = x
-                arr_saved_stars[stars_kept][1] = y
-                arr_saved_stars[stars_kept][2] = z
 
-                # increment the star_kept counter
+                with open(save_path, "a") as stars_data:
+                    stars_data.write(str(float(x)) + ", " + str(float(y)) + ", " + str(float(z)) + "\n")
+
+                # increment the stars_kept counter
                 stars_kept += 1
                 print(stars_kept)
 
@@ -77,32 +67,14 @@ def main():
                 # increment the star_kicked counter
                 stars_kicked += 1
 
-            # increment i
-            i = i + 1
-
     print("")
     end = time.time()
     whole_time = end - start
     out = ">> Finished generating stars in " + str(whole_time) + " seconds\n"
     print(out)
 
-    # write the star coordinates to a file
-    start_write_file = time.time()
-    print(">> Writing the star-data to " + save_path)
-    with open(save_path, "a") as stars_data:
-        for i in range(0, nos):
-            x = arr_saved_stars[i][0]
-            y = arr_saved_stars[i][1]
-            z = arr_saved_stars[i][2]
-
-            stars_data.write(str(x) + ", " + str(y) + ", " + str(z) + "\n")
-
-    end_write_file = time.time()
-    time_write_file = end_write_file - start_write_file
-    out = ">> Finished writing star-data to " + save_path + " in " + str(round(time_write_file, 4)) + " seconds\n"
-    print(out)
-
-    time_all = whole_time + time_write_file
+    # time_all = whole_time + time_write_file
+    time_all = whole_time
 
     time_min = round(time_all / 60, 1)
 
@@ -120,7 +92,7 @@ def main():
     time_all = time_all % 60
     seconds = int( time_all )
 
-    a = path
+    a = "stars/" + str(sys.argv[2]) + ".csv"
 
     time_a = str(hour) + ":" + str(minutes) + ":" + str(seconds)
     b = "{:<20}{:<20}".format("Time (h:m:s)", time_a )
@@ -131,6 +103,8 @@ def main():
     f = a + "\n" + b + "\n" + c + "\n" + d + "\n" + e
 
     call(["telegram-send", "--pre", str(f) ])
+    call(["telegram-send", "-f", str(a) ])
+
 
 if __name__ == "__main__":
     main()
-- 
cgit 1.4.1