d

Aidan-Zamfir · May 16, 2024 · 0362396 · 0362396
1 parent a398f9b
commit 0362396
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/csvData/parser.go b/csvData/parser.go
@@ -40,8 +40,3 @@ func (d *Data) addData(c int) {
 	d.columns = c
 }
 
-
-<<<<<<< HEAD
-=======
-
->>>>>>> dev
diff --git a/data/equations.go b/data/equations.go
@@ -1,14 +1,6 @@
 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 {
@@ -31,10 +23,6 @@ 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]))