changes

Aidan-Zamfir · May 16, 2024 · a398f9b · a398f9b
2 parents c413ff9 + f2c9ac5
commit a398f9b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/csvData/parser.go b/csvData/parser.go
@@ -41,3 +41,7 @@ func (d *Data) addData(c int) {
 }
 
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> dev
diff --git a/data/equations.go b/data/equations.go
@@ -1,6 +1,14 @@
 package data
 
+<<<<<<< HEAD
 var temp_array = []int{10, 32, 44, 12, 92, 40, 19, 32, 1, 9, 6, 20, 17}
+=======
+
+
+var temp_arr = []int{10, 20, 31, 32, 19, 43, 71, 18, 2, 98, 93, 29, 61, 5}
+
+func Normalize() {
+>>>>>>> dev
 
 
 func Minimum(arr []int) int {
@@ -23,7 +31,10 @@ func Maximum(arr []int) int{
 	return max
 }
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> dev
 //normalize:
 //for i in row[x]:
 // normD = (i-min(row[x]) / (max(row[x]) - min(row[x]))