Updates.

qhapaq-49 · Sep 10, 2018 · 7a2ddd3 · 7a2ddd3
1 parent 41b8a3b
commit 7a2ddd3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/experiments/regression.py b/experiments/regression.py
@@ -25,6 +25,7 @@
     "naval": lambda: pd.read_csv("data/uci/naval-propulsion.csv", delim_whitespace=True, header=None).iloc[:,:-1],
     "power": lambda: pd.read_excel("data/uci/power-plant.xlsx"),
     "energy": lambda: pd.read_excel("https://archive.ics.uci.edu/ml/machine-learning-databases/00242/ENB2012_data.xlsx").iloc[:,:-1],
+    "protein": lambda: pd.read_csv("data/uci/protein.csv")[['F1', 'F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'RMSD']]],
 }
 
 base_name_to_learner = {
@@ -74,15 +75,15 @@ def save(self):
             self.print_results()
         time = datetime.datetime.now()
         outfile = open("results/regression/logs_%s_%s.pkl" %
-            (self.name, time.strftime("%Y-%m-%d-%H:%M")), "wb")
+            (self.name, self.args.score) "wb")
         pickle.dump(self, outfile)
 
 
 if __name__ == "__main__":
 
     argparser = ArgumentParser()
     argparser.add_argument("--dataset", type=str, default="housing")
-    argparser.add_argument("--n_est", type=int, default=250)
+    argparser.add_argument("--n_est", type=int, default=350)
     argparser.add_argument("--lr", type=float, default=0.01)
     argparser.add_argument("--score", type=str, default="CRPS")
     argparser.add_argument("--base", type=str, default="tree")
@@ -96,7 +97,6 @@ def save(self):
     X, y = data.iloc[:,:-1].values, data.iloc[:,-1].values
 
     # set default minibatch fraction based on dataset size
-    breakpoint()
     if not args.minibatch_frac:
         args.minibatch_frac = min(0.5, 5000 / len(X))
 

diff --git a/scripts/run_all_regression_crps.sh b/scripts/run_all_regression_crps.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+python3 -m experiments.regression --dataset housing --score=CRPS
+python3 -m experiments.regression --dataset concrete --score=CRPS
+python3 -m experiments.regression --dataset wine --score=CRPS
+python3 -m experiments.regression --dataset kin8nm --score=CRPS
+python3 -m experiments.regression --dataset naval --score=CRPS
+python3 -m experiments.regression --dataset power --score=CRPS
+python3 -m experiments.regression --dataset energy --score=CRPS
+python3 -m experiments.regression --dataset protein --score=CRPS
diff --git a/scripts/run_all_regression_mle.sh b/scripts/run_all_regression_mle.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+python3 -m experiments.regression --dataset housing --score=MLE
+python3 -m experiments.regression --dataset concrete --score=MLE
+python3 -m experiments.regression --dataset wine --score=MLE
+python3 -m experiments.regression --dataset kin8nm --score=MLE
+python3 -m experiments.regression --dataset naval --score=MLE
+python3 -m experiments.regression --dataset power --score=MLE
+python3 -m experiments.regression --dataset energy --score=MLE
+python3 -m experiments.regression --dataset protein --score=MLE