Changed visibility of interval variables and constants

Author: mpraski

common_test.go

@@ -89,7 +89,7 @@ func TestQueueReturnsInPriorityOrderAfterUpdate(t *testing.T) {
 func TestBounds(t *testing.T) {
 	var (
 		f = "data/test.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 		l = 3
 	)
 

csv_importer.go

@@ -11,13 +11,13 @@ import (
 type csvImporter struct {
 }
 
-func NewCsvImporter() Importer {
+func CsvImporter() Importer {
 	return &csvImporter{}
 }
 
 func (i *csvImporter) Import(file string, start, end int) ([][]float64, error) {
 	if start < 0 || end < 0 || start > end {
-		return [][]float64{}, ErrInvalidRange
+		return [][]float64{}, errInvalidRange
 	}
 
 	f, err := os.Open(file)

csv_importer_test.go

@@ -10,7 +10,7 @@ const TOLERANCE = 0.000001
 func TestImportedLoadDataOfCorrectLengh(t *testing.T) {
 	var (
 		f = "data/test.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 		s = 3
 	)
 
@@ -27,7 +27,7 @@ func TestImportedLoadDataOfCorrectLengh(t *testing.T) {
 func TestImportedLoadCorrectData(t *testing.T) {
 	var (
 		f = "data/test.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 		s = [][]float64{
 			[]float64{0.1, 0.2, 0.3},
 			[]float64{0.4, 0.5, 0.6},
@@ -68,7 +68,7 @@ func fsliceEqual(a, b [][]float64) bool {
 func BenchmarkImport(b *testing.B) {
 	var (
 		f = "data/bus-stops.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 	)
 
 	b.ResetTimer()

dbscan.go

@@ -33,15 +33,15 @@ type dbscanClusterer struct {
 // is controlled via workers argument. Passing 0 will result in this number being chosen arbitrarily.
 func DBSCAN(minpts int, eps float64, workers int, distance DistanceFunc) (HardClusterer, error) {
 	if minpts < 1 {
-		return nil, ErrZeroMinpts
+		return nil, errZeroMinpts
 	}
 
 	if workers < 0 {
-		return nil, ErrZeroWorkers
+		return nil, errZeroWorkers
 	}
 
 	if eps <= 0 {
-		return nil, ErrZeroEpsilon
+		return nil, errZeroEpsilon
 	}
 
 	var d DistanceFunc
@@ -71,7 +71,7 @@ func (c *dbscanClusterer) WithOnline(o Online) HardClusterer {
 
 func (c *dbscanClusterer) Learn(data [][]float64) error {
 	if len(data) == 0 {
-		return ErrEmptySet
+		return errEmptySet
 	}
 
 	c.mu.Lock()

errors.go

@@ -3,13 +3,13 @@ package clusters
 import "errors"
 
 var (
-	ErrEmptySet       = errors.New("Empty training set")
-	ErrNotTrained     = errors.New("You need to train the algorithm first")
-	ErrZeroIterations = errors.New("Number of iterations cannot be less than 1")
-	ErrOneCluster     = errors.New("Number of clusters cannot be less than 2")
-	ErrZeroEpsilon    = errors.New("Epsilon cannot be 0")
-	ErrZeroMinpts     = errors.New("MinPts cannot be 0")
-	ErrZeroWorkers    = errors.New("Number of workers cannot be less than 0")
-	ErrZeroXi         = errors.New("Xi cannot be 0")
-	ErrInvalidRange   = errors.New("Range is invalid")
+	errEmptySet       = errors.New("Empty training set")
+	errNotTrained     = errors.New("You need to train the algorithm first")
+	errZeroIterations = errors.New("Number of iterations cannot be less than 1")
+	errOneCluster     = errors.New("Number of clusters cannot be less than 2")
+	errZeroEpsilon    = errors.New("Epsilon cannot be 0")
+	errZeroMinpts     = errors.New("MinPts cannot be 0")
+	errZeroWorkers    = errors.New("Number of workers cannot be less than 0")
+	errZeroXi         = errors.New("Xi cannot be 0")
+	errInvalidRange   = errors.New("Range is invalid")
 )

kmeans.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	CHANGES_THRESHOLD = 2
+	changesThreshold = 2
 )
 
 type kmeansClusterer struct {
@@ -39,11 +39,11 @@ type kmeansClusterer struct {
 // Implementation of k-means++ algorithm with online learning
 func KMeans(iterations, clusters int, distance DistanceFunc) (HardClusterer, error) {
 	if iterations < 1 {
-		return nil, ErrZeroIterations
+		return nil, errZeroIterations
 	}
 
 	if clusters < 2 {
-		return nil, ErrOneCluster
+		return nil, errOneCluster
 	}
 
 	var d DistanceFunc
@@ -79,7 +79,7 @@ func (c *kmeansClusterer) WithOnline(o Online) HardClusterer {
 
 func (c *kmeansClusterer) Learn(data [][]float64) error {
 	if len(data) == 0 {
-		return ErrEmptySet
+		return errEmptySet
 	}
 
 	c.mu.Lock()
@@ -90,7 +90,7 @@ func (c *kmeansClusterer) Learn(data [][]float64) error {
 	c.b = make([]int, c.number)
 
 	c.counter = 0
-	c.threshold = CHANGES_THRESHOLD
+	c.threshold = changesThreshold
 	c.changes = 0
 	c.oldchanges = 0
 

kmeans_estimator.go

@@ -30,11 +30,11 @@ type kmeansEstimator struct {
 // clustering algorithm
 func KMeansEstimator(iterations, clusters int, distance DistanceFunc) (Estimator, error) {
 	if iterations < 1 {
-		return nil, ErrZeroIterations
+		return nil, errZeroIterations
 	}
 
 	if clusters < 2 {
-		return nil, ErrOneCluster
+		return nil, errOneCluster
 	}
 
 	var d DistanceFunc
@@ -55,7 +55,7 @@ func KMeansEstimator(iterations, clusters int, distance DistanceFunc) (Estimator
 
 func (c *kmeansEstimator) Estimate(data [][]float64) (int, error) {
 	if len(data) == 0 {
-		return 0, ErrEmptySet
+		return 0, errEmptySet
 	}
 
 	var (
@@ -112,7 +112,7 @@ func (c *kmeansEstimator) learn(data [][]float64) {
 	c.b = make([]int, c.number)
 
 	c.counter = 0
-	c.threshold = CHANGES_THRESHOLD
+	c.threshold = changesThreshold
 	c.changes = 0
 	c.oldchanges = 0
 

kmeans_estimator_test.go

@@ -12,7 +12,7 @@ func TestKmeansEstimator(t *testing.T) {
 
 	var (
 		f = "data/bus-stops.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 	)
 
 	d, e := i.Import(f, 4, 5)

kmeans_test.go

@@ -11,7 +11,7 @@ func TestKmeansClusterNumerMatches(t *testing.T) {
 
 	var (
 		f = "data/bus-stops.csv"
-		i = NewCsvImporter()
+		i = CsvImporter()
 	)
 
 	d, e := i.Import(f, 4, 5)

optics.go

@@ -50,19 +50,19 @@ type opticsClusterer struct {
 // is controlled via workers argument. Passing 0 will result in this number being chosen arbitrarily.
 func OPTICS(minpts int, eps, xi float64, workers int, distance DistanceFunc) (HardClusterer, error) {
 	if minpts < 1 {
-		return nil, ErrZeroMinpts
+		return nil, errZeroMinpts
 	}
 
 	if workers < 0 {
-		return nil, ErrZeroWorkers
+		return nil, errZeroWorkers
 	}
 
 	if eps <= 0 {
-		return nil, ErrZeroEpsilon
+		return nil, errZeroEpsilon
 	}
 
 	if xi <= 0 {
-		return nil, ErrZeroXi
+		return nil, errZeroXi
 	}
 
 	var d DistanceFunc
@@ -94,7 +94,7 @@ func (c *opticsClusterer) WithOnline(o Online) HardClusterer {
 
 func (c *opticsClusterer) Learn(data [][]float64) error {
 	if len(data) == 0 {
-		return ErrEmptySet
+		return errEmptySet
 	}
 
 	c.mu.Lock()