From b015e072ba41424d8705cdb0bfef02f6a70b0dde Mon Sep 17 00:00:00 2001 From: Richard Townsend Date: Mon, 7 Sep 2020 21:37:18 +0100 Subject: [PATCH] fix: shift examples around Was failing because two package names appeared in the same directory --- examples/trees/{ => cart}/cart.go | 9 ++++----- examples/trees/{trees.go => decision/decision.go} | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename examples/trees/{ => cart}/cart.go (88%) rename examples/trees/{trees.go => decision/decision.go} (97%) diff --git a/examples/trees/cart.go b/examples/trees/cart/cart.go similarity index 88% rename from examples/trees/cart.go rename to examples/trees/cart/cart.go index 5a19cab..930891f 100644 --- a/examples/trees/cart.go +++ b/examples/trees/cart/cart.go @@ -7,7 +7,6 @@ import ( "github.com/sjwhitworth/golearn/base" "github.com/sjwhitworth/golearn/trees" - ) func main() { @@ -37,7 +36,7 @@ func main() { */ // Load Titanic Data For classification - classificationData, err := base.ParseCSVToInstances("../datasets/titanic.csv", false) + classificationData, err := base.ParseCSVToInstances("../../datasets/titanic.csv", false) if err != nil { panic(err) } @@ -45,7 +44,7 @@ func main() { // Create New Classification Tree // Hyperparameters - loss function, max Depth (-1 will split until pure), list of unique labels - decTree := NewDecisionTreeClassifier("entropy", -1, []int64{0, 1}) + decTree := trees.NewDecisionTreeClassifier("entropy", -1, []int64{0, 1}) // Train Tree err = decTree.Fit(trainData) @@ -65,14 +64,14 @@ func main() { fmt.Println(decTree.Evaluate(testData)) // Load House Price Data For Regression - regressionData, err := base.ParseCSVToInstances("../datasets/boston_house_prices.csv", false) + regressionData, err := base.ParseCSVToInstances("../../datasets/boston_house_prices.csv", false) if err != nil { panic(err) } trainRegData, testRegData := base.InstancesTrainTestSplit(regressionData, 0.5) // Hyperparameters - Loss function, max Depth (-1 will split until pure) - regTree := NewDecisionTreeRegressor("mse", -1) + regTree := trees.NewDecisionTreeRegressor("mse", -1) // Train Tree err = regTree.Fit(trainRegData) diff --git a/examples/trees/trees.go b/examples/trees/decision/decision.go similarity index 97% rename from examples/trees/trees.go rename to examples/trees/decision/decision.go index c73fc4f..9bdd44f 100644 --- a/examples/trees/trees.go +++ b/examples/trees/decision/decision.go @@ -4,12 +4,13 @@ package main import ( "fmt" + "math/rand" + "github.com/sjwhitworth/golearn/base" "github.com/sjwhitworth/golearn/ensemble" "github.com/sjwhitworth/golearn/evaluation" "github.com/sjwhitworth/golearn/filters" "github.com/sjwhitworth/golearn/trees" - "math/rand" ) func main() { @@ -19,7 +20,7 @@ func main() { rand.Seed(44111342) // Load in the iris dataset - iris, err := base.ParseCSVToInstances("../datasets/iris_headers.csv", true) + iris, err := base.ParseCSVToInstances("../../datasets/iris_headers.csv", true) if err != nil { panic(err) }