for detailed information about the changes, see https://git.darknebu.la/GalaxySimulator/Source/pulls/1

1 files changed, 10 insertions, 46 deletions

diff --git a/csv/csv.go b/csv/csv.go
index 7a0fa9f..aca131b 100644
--- a/csv/csv.go
+++ b/csv/csv.go
@@ -1,75 +1,39 @@
 package csv
 
 import (
+	"../file"
 	"../structs"
-	"encoding/csv"
-	"log"
-	"math/rand"
-	"os"
+	"git.darknebu.la/bit/logplus"
 	"strconv"
-	"time"
 )
 
-// openStar2DCSV opens the file at the given path and reads its content. It then returns the content inform of a slice
-// of slices
-func openStar2DCSV(path string) [][]string {
-
-	// Open the file located at the given path
-	b, err := os.Open(path)
-
-	// Handle errors
-	if err != nil {
-		log.Printf("openStar2DsCSV Panic! (cannot read file from %s)", path)
-	}
-
-	// Close the file afre reading it's content
-	defer b.Close()
-
-	// Parse the files conten usin a csv-reader
-	lines, err := csv.NewReader(b).ReadAll()
-
-	// Handle errors
-	if err != nil {
-		log.Println("openStar2DsCSV Panic! (cannot read the files content)")
-	}
-
-	return lines
-}
-
 // Import gets a file, a starting line, an ending line and  a struct. It then adds the content of the file to the struct
 // For finding the length of the .csv, you can use the following command in linux:
 // $ cat <csv> | wc -l
 func Import(path string, start int, end int, slice []structs.Star2D) []structs.Star2D {
-	lines := openStar2DCSV(path)
-
-	// seed the random number generator
-	rand.Seed(time.Now().UTC().UnixNano())
+	f, _ := file.Open(path)
+	lines, _ := f.ReadCSV()
 
-	// iterate over all the lines in the given range
 	for linenr, line := range lines[start:end] {
 		x, errx := strconv.ParseFloat(line[0], 64)
 		y, erry := strconv.ParseFloat(line[1], 64)
 
 		// Handle errors
 		if errx != nil {
-			log.Printf("error reading value from csv in line nr. %d (%s)", linenr, errx)
+			logplus.LogFError("error reading value from csv in line nr. %d (%s)", linenr, errx)
 		}
 		if erry != nil {
-			log.Printf("error reading value from csv in line nr. %d (%s)", linenr, erry)
+			logplus.LogFError("error reading value from csv in line nr. %d (%s)", linenr, erry)
 		}
 
-		// TODO: Export the code below to its own function
-		var mass float64 = float64(10000 + rand.Intn(100000-10000))
-
 		// Create a temporary star for assembling the star
-		tempStar2D := structs.Star2D{
-			structs.Coord{X: x, Y: y},
-			structs.Force{X: 0, Y: 0},
-			mass,
+		tempStar := structs.Star2D{
+			C: structs.Vec2{X: x, Y: y},
+			M: 50000,
 		}
 
 		// Add the Temporary star to the slice
-		slice = append(slice, tempStar2D)
+		slice = append(slice, tempStar)
 
 	}