Fix bug in using csv dataset

dataset.py

@@ -89,7 +89,7 @@ class Dataset:
         )
 
     def _get_data(self):
-        if self.mode == "generate":
+        if self.mode == "generate" or self.csv_path is None:
             return get_data_points(
                 function=self.function,
                 x1lim=self.x1lim,
@@ -101,14 +101,14 @@ class Dataset:
 
         elif self.mode == "csv":
             if self.csv_path is None:
-                return np.array([]), np.array([])
+                raise RuntimeError("Something is wrong")
 
             df = pd.read_csv(self.csv_path)
-            if df.shape[1] != 2:
-                raise ValueError("CSV file must have exactly two columns")
+            if df.shape[1] != 3:
+                raise ValueError("CSV file must have exactly three columns")
 
-            x = df.iloc[:, 0].values.reshape(-1, 1)
-            y = df.iloc[:, 1].values
+            x = df.iloc[:, :-1].values
+            y = df.iloc[:, -1].values
             return x, y
 
         else:
@@ -292,7 +292,7 @@ class DatasetView:
             regenerate = gr.Button("Regenerate Data")
 
             csv_upload = gr.File(
-                label="Upload CSV file", 
+                label="Upload CSV file - must have columns: (x1, x2, y)", 
                 file_types=['.csv'],
                 visible=False,  # function mode is default
             )

regularization.py

@@ -16,7 +16,7 @@ logging.basicConfig(
 )
 logger = logging.getLogger("ELVIS")
 
-from dataset import Dataset, DatasetView, get_function
+from dataset import Dataset, DatasetView
 
 def min_corresponding_entries(W1, W2, w1, tol=0.1):
     mask = (W1 <= w1)