From 965b51e38c2996b0e8fcc465017a570bbf240d83 Mon Sep 17 00:00:00 2001
From: ulises-jeremias <ulisescf.24@gmail.com>
Date: Tue, 17 Oct 2023 01:17:51 -0300
Subject: [PATCH] Updated constructors

---
 examples/data_analysis_example/main.v | 24 ++++++++++++------------
 ml/kmeans.v                           |  2 +-
 ml/linreg.v                           |  2 +-
 ml/logreg.v~                          |  2 +-
 ml/workspace.v                        |  2 +-
 ml/workspace_test.v                   |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/examples/data_analysis_example/main.v b/examples/data_analysis_example/main.v
index a0c93500f..6632f50ca 100644
--- a/examples/data_analysis_example/main.v
+++ b/examples/data_analysis_example/main.v
@@ -1,11 +1,11 @@
 module main
 
-import vsl.ml
-import vsl.plot
+import vsl.ml { Data, Stat }
+import vsl.plot { Axis, AxisTitle, Marker, Plot }
 
 fn main() {
 	// Example data: two features (X1 and X2) and a label (y)
-	mut data := ml.Data.from_raw_xy([
+	mut data := Data.from_raw_xy([
 		[1.0, 2.0, 0.0],
 		[2.0, 3.0, 0.0],
 		[3.0, 3.0, 0.0],
@@ -62,7 +62,7 @@ fn main() {
 	])!
 
 	// Visualize data in a 3D scatter plot
-	mut plt_3d := plot.Plot.new()
+	mut plt_3d := Plot.new()
 
 	x1 := data.x.get_col(0)
 	x2 := data.x.get_col(1)
@@ -90,7 +90,7 @@ fn main() {
 		y: x2_class0
 		z: [][]f64{len: x1_class0.len, init: [0.0]}
 		mode: 'markers'
-		marker: plot.Marker{
+		marker: Marker{
 			size: []f64{len: x1_class0.len, init: 8.0}
 			color: []string{len: x1_class0.len, init: 'blue'}
 		}
@@ -101,7 +101,7 @@ fn main() {
 		y: x2_class1
 		z: [][]f64{len: x1_class1.len, init: [0.0]}
 		mode: 'markers'
-		marker: plot.Marker{
+		marker: Marker{
 			size: []f64{len: x1_class1.len, init: 8.0}
 			color: []string{len: x1_class1.len, init: 'red'}
 		}
@@ -111,13 +111,13 @@ fn main() {
 	// Configure the layout of the 3D plot
 	plt_3d.layout(
 		title: 'Two-class Data'
-		xaxis: plot.Axis{
-			title: plot.AxisTitle{
+		xaxis: Axis{
+			title: AxisTitle{
 				text: 'X1'
 			}
 		}
-		yaxis: plot.Axis{
-			title: plot.AxisTitle{
+		yaxis: Axis{
+			title: AxisTitle{
 				text: 'X2'
 			}
 		}
@@ -127,11 +127,11 @@ fn main() {
 	plt_3d.show()!
 
 	// Basic statistics analysis
-	mut stat := ml.Stats.from_data(mut data, 'Example Data')
+	mut stat := Stat.from_data(mut data, 'Example Data')
 	stat.update()
 
 	// Visualize statistics in a bar chart
-	mut plt_bars := plot.Plot.new()
+	mut plt_bars := Plot.new()
 
 	plt_bars.bar(
 		x: []string{len: stat.mean_x.len, init: 'Class ${index}'}
diff --git a/ml/kmeans.v b/ml/kmeans.v
index 79d1033ef..75f422323 100644
--- a/ml/kmeans.v
+++ b/ml/kmeans.v
@@ -28,7 +28,7 @@ pub fn Kmeans.new(mut data Data[f64], nb_classes int, name string) &Kmeans {
 	nb_members := []int{len: nb_classes}
 
 	// stat
-	mut stat := Stats.from_data(mut data, 'stat_${name}')
+	mut stat := Stat.from_data(mut data, 'stat_${name}')
 	stat.update()
 
 	// bins
diff --git a/ml/linreg.v b/ml/linreg.v
index b712d83ba..cace7c402 100644
--- a/ml/linreg.v
+++ b/ml/linreg.v
@@ -23,7 +23,7 @@ pub mut:
 //     data   -- x,y data
 //     name   -- unique name of this (observer) object
 pub fn LinReg.new(mut data Data[f64], name string) &LinReg {
-	mut stat := Stats.from_data(mut data, 'stat_' + name)
+	mut stat := Stat.from_data(mut data, 'stat_' + name)
 	stat.update()
 	params := ParamsReg.new[f64](data.nb_features)
 	mut reg := &LinReg{
diff --git a/ml/logreg.v~ b/ml/logreg.v~
index 6b314dd41..e10c95975 100644
--- a/ml/logreg.v~
+++ b/ml/logreg.v~
@@ -24,7 +24,7 @@ mut:
 //     params -- θ, b, λ
 //     name   -- unique name of this (observer) object
 pub fn LogReg.new(mut data Data, params &ParamsReg, name string) LogReg {
-	mut stat := Stats.from_data(mut data, "stat_" + name)
+	mut stat := Stat.from_data(mut data, "stat_" + name)
 	stat.update()
 	mut log_reg := LogReg{
                 name: name
diff --git a/ml/workspace.v b/ml/workspace.v
index 71adf6cd6..ff29dca93 100644
--- a/ml/workspace.v
+++ b/ml/workspace.v
@@ -28,7 +28,7 @@ pub mut:
 }
 
 // stat returns a new Stat object
-pub fn Stats.from_data[T](mut data Data[T], name string) &Stat[T] {
+pub fn Stat.from_data[T](mut data Data[T], name string) &Stat[T] {
 	mut o := &Stat[T]{
 		name: name
 		data: data
diff --git a/ml/workspace_test.v b/ml/workspace_test.v
index 1c445bf98..5daa16ec0 100644
--- a/ml/workspace_test.v
+++ b/ml/workspace_test.v
@@ -41,7 +41,7 @@ fn test_stat_01() {
 	mut data := Data.from_raw_xy(xy)!
 
 	// stat
-	mut stat := Stats.from_data(mut data, 'stat')
+	mut stat := Stat.from_data(mut data, 'stat')
 
 	// notify update
 	data.notify_update()