Merge pull request #6 from cha87de/improve-phases

improve phases and periods

Author: cha87de

api/tsprofiler.go

@@ -13,8 +13,10 @@ type TSProfiler interface {
 	// Get generates an returns a profile based on previously put data
 	Get() models.TSProfile
 
-	GetCurrentState() map[string]models.TSStats
+	GetCurrentStats() map[string]models.TSStats
+	GetCurrentState() []models.TSState
 	GetCurrentPhase() int
+	GetCurrentPeriodPath() []int
 
 	// Terminate stops and removes the profiler
 	Terminate()

cmd/csv2tsprofile/main.go

@@ -2,10 +2,8 @@ package main
 
 import (
 	"encoding/csv"
-	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"strconv"
@@ -18,24 +16,33 @@ import (
 )
 
 var options struct {
-	States                int     `long:"states" default:"4"`
-	BufferSize            int     `long:"buffersize" default:"10"`
-	History               int     `long:"history" default:"1"`
-	FilterStdDevs         int     `long:"filterstddevs" default:"2"`
-	FixedBound            bool    `long:"fixedbound"`
-	FixedMin              float64 `long:"fixedmin" default:"0" description:"if fixedbound is set, set the min value"`
-	FixedMax              float64 `long:"fixedmax" default:"100" description:"if fixedbound is set, set the max value"`
-	PeriodSize            string  `long:"periodsize" default:"" description:"comma separated list of ints, specifies descrete states per period"`
-	PeriodChangeRatio     float64 `long:"periodchangeratio" default:"0.2" description:"accepted ratio [0,1] for changes, alert if above"`
-	PhaseChangeLikeliness float32 `long:"phasechangelikeliness" default:"0.6"`
-	PhaseChangeMincount   int64   `long:"phasechangemincount" default:"60"`
-	Outputfile            string  `long:"output" default:"-" description:"path to write profile to, stdout if '-'"`
-	PhasesFile            string  `long:"out.phases" default:""`
-	Inputfile             string
+	States        int `long:"states" default:"4"`
+	BufferSize    int `long:"buffersize" default:"10"`
+	History       int `long:"history" default:"1"`
+	FilterStdDevs int `long:"filterstddevs" default:"2"`
+
+	FixedBound bool    `long:"fixedbound"`
+	FixedMin   float64 `long:"fixedmin" default:"0" description:"if fixedbound is set, set the min value"`
+	FixedMax   float64 `long:"fixedmax" default:"100" description:"if fixedbound is set, set the max value"`
+
+	PeriodSize string `long:"periodsize" default:"" description:"comma separated list of ints, specifies descrete states per period"`
+
+	PhaseChangeLikeliness float32 `long:"phasechangelikeliness" default:""`
+	PhaseChangeHistory    int64   `long:"phasechangehistory" default:"1"`
+
+	Outputfile  string `long:"output" default:"-" description:"path to write profile to, stdout if '-'"`
+	Historyfile string `long:"out.history" default:"" description:"path to write last historic values to, stdout if '-', empty to disable"`
+	PhasesFile  string `long:"out.phases" default:""`
+	PeriodsFile string `long:"out.periods" default:""`
+	StatesFile  string `long:"out.states" default:""`
+
+	Inputfile string
 }
 
 var tsprofiler api.TSProfiler
 var phasesfile *os.File
+var periodsfile *os.File
+var statesfile *os.File
 
 func main() {
 	initializeFlags()
@@ -46,18 +53,40 @@ func main() {
 	// create & open output file
 	if options.PhasesFile != "" && options.PhasesFile != "-" {
 		var err error
-		phasesfile, err = os.OpenFile(options.PhasesFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		phasesfile, err = os.OpenFile(options.PhasesFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
 		if err != nil {
 			log.Fatal(err)
 		}
 		defer phasesfile.Close()
 	}
+	if options.PeriodsFile != "" && options.PeriodsFile != "-" {
+		var err error
+		periodsfile, err = os.OpenFile(options.PeriodsFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer periodsfile.Close()
+	}
+	if options.StatesFile != "" && options.StatesFile != "-" {
+		var err error
+		statesfile, err = os.OpenFile(options.StatesFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer statesfile.Close()
+	}
 
 	// read file line by line
 	readFile(options.Inputfile)
 
 	// get and print profile
-	profileOutput()
+	outputProfile()
+
+	// print last states and positions
+	if options.Historyfile != "" {
+		outputHistory()
+	}
+
 }
 
 func initializeFlags() {
@@ -111,7 +140,7 @@ func initProfiler() {
 		FixBound:              options.FixedBound,
 		PeriodSize:            periodSize,
 		PhaseChangeLikeliness: options.PhaseChangeLikeliness,
-		PhaseChangeMincount:   options.PhaseChangeMincount,
+		PhaseChangeHistory:    options.PhaseChangeHistory,
 	})
 }
 
@@ -160,41 +189,57 @@ func putMeasurement(utilValue []float64) {
 	}
 	tsprofiler.Put(tsinput)
 
-	//state := tsprofiler.GetCurrentState()
+	// print phases
 	phaseid := tsprofiler.GetCurrentPhase()
-	// handle phases output
-	row := fmt.Sprintf("%d\n", phaseid)
 	if options.PhasesFile == "-" {
 		// use stdout
+		row := fmt.Sprintf("%d\n", phaseid)
 		fmt.Print(row)
 	} else if options.PhasesFile == "" {
 		// ignore likeliness
 	} else {
 		// print to file
+		row := fmt.Sprintf("%d\n", phaseid)
 		if _, err := phasesfile.Write([]byte(row)); err != nil {
 			log.Fatal(err)
 		}
 	}
-}
 
-func profileOutput() {
-	profile := tsprofiler.Get()
-	json, err := json.Marshal(profile)
-	if err != nil {
-		fmt.Printf("cannot create json: %s (original: %+v)\n", err, profile)
-		return
+	// print periods
+	periodPath := strings.Trim(strings.Replace(fmt.Sprint(tsprofiler.GetCurrentPeriodPath()), " ", ",", -1), "[]")
+	if options.PeriodsFile == "-" {
+		// use stdout
+		row := fmt.Sprintf("%s\n", periodPath)
+		fmt.Print(row)
+	} else if options.PeriodsFile == "" {
+		// ignore
+	} else {
+		// print to file
+		row := fmt.Sprintf("%s\n", periodPath)
+		if _, err := periodsfile.Write([]byte(row)); err != nil {
+			log.Fatal(err)
+		}
 	}
 
-	if options.Outputfile == "-" {
-		// print to stdout
-		fmt.Printf("%s\n", json)
+	// print states
+	state := tsprofiler.GetCurrentState()
+	stateRow := ""
+	for _, s := range state {
+		if stateRow != "" {
+			stateRow = stateRow + " "
+		}
+		stateRow = fmt.Sprintf("%s%d", stateRow, s.State.Value)
+	}
+	stateRow = stateRow + "\n"
+	if options.StatesFile == "-" {
+		// use stdout
+		fmt.Print(stateRow)
+	} else if options.StatesFile == "" {
+		// ignore
 	} else {
-		// write to file
-		err := ioutil.WriteFile(options.Outputfile, json, 0644)
-		if err != nil {
-			fmt.Printf("cannot write json to file %s: %s\n", options.Outputfile, err)
-			return
+		// print to file
+		if _, err := statesfile.Write([]byte(stateRow)); err != nil {
+			log.Fatal(err)
 		}
 	}
-
 }

cmd/csv2tsprofile/output.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+
+	"github.com/cha87de/tsprofiler/models"
+)
+
+func outputHistory() {
+	if options.Historyfile == "" {
+		// output disabled, ignore method call
+		return
+	}
+	state := tsprofiler.GetCurrentState()
+	historicStates := make([]map[string]string, 1)
+	historicStates[0] = make(map[string]string)
+	for _, s := range state {
+		historicStates[0][s.Metric] = fmt.Sprintf("%d", s.State.Value)
+	}
+
+	history := models.History{
+		CurrentPhase:   tsprofiler.GetCurrentPhase(),
+		PeriodPath:     tsprofiler.GetCurrentPeriodPath(),
+		HistoricStates: historicStates,
+	}
+
+	json, err := json.Marshal(history)
+	if err != nil {
+		fmt.Printf("cannot create json: %s (original: %+v)\n", err, history)
+		return
+	}
+
+	// print to stdout
+	if options.Historyfile == "-" {
+		// print to stdout
+		fmt.Printf("%s\n", json)
+	} else {
+		// write to file
+		err := ioutil.WriteFile(options.Historyfile, json, 0644)
+		if err != nil {
+			fmt.Printf("cannot write json to file %s: %s\n", options.Historyfile, err)
+			return
+		}
+	}
+}
+
+func outputProfile() {
+	profile := tsprofiler.Get()
+	json, err := json.Marshal(profile)
+	if err != nil {
+		fmt.Printf("cannot create json: %s (original: %+v)\n", err, profile)
+		return
+	}
+
+	if options.Outputfile == "-" {
+		// print to stdout
+		fmt.Printf("%s\n", json)
+	} else {
+		// write to file
+		err := ioutil.WriteFile(options.Outputfile, json, 0644)
+		if err != nil {
+			fmt.Printf("cannot write json to file %s: %s\n", options.Outputfile, err)
+			return
+		}
+	}
+}

cmd/tspredictor/main.go

@@ -3,6 +3,9 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
+
+	"github.com/cha87de/tsprofiler/cmd/tspredictor/task"
 
 	"github.com/cha87de/tsprofiler/models"
 	"github.com/cha87de/tsprofiler/predictor"
@@ -11,30 +14,46 @@ import (
 )
 
 var options struct {
-	Steps     int                      `long:"steps" default:"40"`
-	Mode      predictor.PredictionMode `long:"mode" default:"0"`
-	Inputfile string
+	Steps       int                      `long:"steps" default:"40"`
+	Mode        predictor.PredictionMode `long:"mode" default:"0"`
+	PeriodDepth int                      `long:"periodDepth" default:"0"`
+	Profilefile string                   `long:"profile" short:"p"`
+	Historyfile string                   `long:"history" short:"h"`
+	Task        string
 }
 
 func main() {
 	initializeFlags()
 
-	profile := utils.ReadProfileFromFile(options.Inputfile)
-	predictor := predictor.NewPredictor(profile)
-	predictor.SetMode(options.Mode)
-	/*predictor.SetState(map[string]string{
-		"metric_0": "0",
-	})*/
-	simulation := predictor.Simulate(options.Steps)
+	profile := utils.ReadProfileFromFile(options.Profilefile)
+	history := models.ReadHistoryFromFile(options.Historyfile)
+
+	var err error
 
-	printSimulation(simulation)
+	switch options.Task {
+	case "simulate":
+		simulate := task.NewSimulate(profile, options.Mode, history)
+		err = simulate.Run(options.Steps, options.PeriodDepth)
+		simulate.Print()
+	case "likeliness":
+		likeliness := task.NewLikeliness(profile, options.Mode, history)
+		likeliness.Run(options.PeriodDepth)
+	default:
+		fmt.Printf("task %s unknown. Select \"simulate\" or \"likeliness\" as task.", options.Task)
+	}
+
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%s", err)
+		os.Exit(1)
+	}
+	os.Exit(0)
 }
 
 func initializeFlags() {
 	// initialize parser for flags
 	parser := flags.NewParser(&options, flags.Default)
 	parser.ShortDescription = "tspredictor"
-	parser.LongDescription = "Simulates the next steps for a given tsprofile json file"
+	parser.LongDescription = "Reads a TSProfile from file and runs tasks on in (Simulate or Likeliness)"
 	parser.ArgsRequired = true
 
 	// Parse parameters
@@ -53,34 +72,8 @@ func initializeFlags() {
 	}
 
 	if len(args) < 1 {
-		fmt.Printf("No input file specified.\n")
+		fmt.Printf("No task specified. Select \"simulate\" or \"likeliness\" as task.\n")
 		os.Exit(1)
 	}
-	options.Inputfile = args[0]
-}
-
-func printSimulation(simulation [][]models.TSState) {
-	if len(simulation) <= 0 {
-		return
-	}
-
-	// print header
-	for i, tsstate := range simulation[0] {
-		if i > 0 {
-			fmt.Printf(",")
-		}
-		fmt.Printf("%s", tsstate.Metric)
-	}
-	fmt.Printf("\n")
-
-	// print rows
-	for _, simstep := range simulation {
-		for i, tsstate := range simstep {
-			if i > 0 {
-				fmt.Printf(",")
-			}
-			fmt.Printf("%d", tsstate.State.Value)
-		}
-		fmt.Printf("\n")
-	}
+	options.Task = strings.ToLower(args[0])
 }