From ca6a390c61c5272d1fd2bac55c19e3d69fd901b9 Mon Sep 17 00:00:00 2001 From: Jorge Fabila Date: Tue, 17 Jun 2025 08:57:21 +0200 Subject: [PATCH] added variables to make run linear models --- client_cmd.py | 9 ++++++++- server_cmd.py | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/client_cmd.py b/client_cmd.py index 98bbc79..f130446 100644 --- a/client_cmd.py +++ b/client_cmd.py @@ -43,6 +43,7 @@ parser.add_argument("--experiment", type=json.loads, default={"name": "experiment_1", "log_path": "logs", "debug": "true"}, help="experiment logs") parser.add_argument("--smoothWeights", type=json.loads, default= {"smoothing_strenght": 0.5}, help="Smoothing parameters") parser.add_argument("--linear_models", type=json.loads, default={"n_features": 9}, help="Linear model parameters") + parser.add_argument("--n_features", type=int, default=0, help="Number of features") parser.add_argument("--random_forest", type=json.loads, default={"balanced_rf": "true"}, help="Random forest parameters") parser.add_argument("--weighted_random_forest", type=json.loads, default={"balanced_rf": "true", "levelOfDetail": "DecisionTree"}, help="Weighted random forest parameters") parser.add_argument("--xgb", type=json.loads, default={"batch_size": 32,"num_iterations": 100,"task_type": "BINARY","tree_num": 500}, help="XGB parameters") @@ -50,7 +51,13 @@ args = parser.parse_args() config = vars(args) - + + if config["model"] in ("logistic_regression", "elastic_net", "lsvc"): + print("LINEAR", config["model"], config["n_features"]) + config["linear_models"] = {} + config['linear_models']['n_features'] = config["n_features"] + config["held_out_center_id"] = -1 + # Create sandbox log file path sandbox_log_file = Path(os.path.join(config["sandbox_path"], "log_client.txt")) diff --git a/server_cmd.py b/server_cmd.py index 0de88a3..d2d5e50 100644 --- a/server_cmd.py +++ b/server_cmd.py @@ -55,11 +55,18 @@ def check_config(config): parser.add_argument("--local_port", type=int, default=8081, help="Local port") parser.add_argument("--experiment", type=json.loads, default={"name": "experiment_1", "log_path": "logs", "debug": "true"}, help="experiment logs") parser.add_argument("--random_forest", type=json.loads, default={"balanced_rf": "true"}, help="Random forest parameters") + parser.add_argument("--n_features", type=int, default=0, help="Number of features") args = parser.parse_args() config = vars(args) + if config["model"] in ("logistic_regression", "elastic_net", "lsvc"): + print("LINEAR", config["model"], config["n_features"]) + config["linear_models"] = {} + config['linear_models']['n_features'] = config["n_features"] + config["held_out_center_id"] = -1 + experiment_dir = Path(os.path.join(config["experiment"]["log_path"], config["experiment"]["name"])) config["experiment_dir"] = experiment_dir