From 95f9ab588b7840739fbd782653926a3a74e99ab4 Mon Sep 17 00:00:00 2001 From: emile Date: Mon, 15 Oct 2018 15:18:12 +0200 Subject: Replaced the llog package by the identical logplus library hosted on darknebu.la --- main.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 1727d62..48ed075 100644 --- a/main.go +++ b/main.go @@ -4,34 +4,40 @@ import ( "./csv" "./draw" "./forces" - "./llog" "./structs" "fmt" + "git.darknebu.la/bit/logplus" ) func main() { var threads int = 8 var frames int = 1 + var stars int = 800 // the slice starsSlice stores the star structures starsSlice := []structs.Star{} - llog.Good("Opening the csv") - starsSlice = csv.Import("data/U_ALL.csv", 0, 2500, starsSlice) + logplus.LogPositive("Opening the csv") + starsSlice = csv.Import("data/U_ALL.csv", 0, stars, starsSlice) // Simulate the position of the stars after a specific time for i := 0; i < frames; i++ { - llog.Great("--- --- --- --- ---") - llog.Great(fmt.Sprintf("Frames %d/%d", i, frames)) - llog.Good("Calculate the new Star positions") + // Print the iterator + logplus.LogPositive("--- --- --- --- ---") + logplus.LogPositive(fmt.Sprintf("Frames %d/%d", i, frames)) + + // Calculate the position of stars after one timestep + logplus.LogPositive("Calculate the new Star positions") starsSlice = forces.NextTimestep(starsSlice, 500000) - llog.Good("Calculate the acting forces") + // Calculate all the forces acting inside of the galaxy + logplus.LogPositive("Calculate the acting forces") starsSlice = forces.CalcAllForces(starsSlice, threads) + // Save the slice outputName := fmt.Sprintf("out_%d.png", i+1) - llog.Good(fmt.Sprintf("draw the slice and save it to %s\n", outputName)) + logplus.LogPositive(fmt.Sprintf("draw the slice and save it to %s\n", outputName)) draw.Slice(starsSlice, outputName) } } -- cgit 1.4.1