Skip to content

Fix/my arreglo #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J-Fabila merged 3 commits into from
Jun 17, 2025
Merged

Fix/my arreglo #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6a390
added variables to make run linear models
J-Fabila Jun 17, 2025
d15043d
Merge branch 'main' of github.com:DataTools4Heart/flcore into main
J-Fabila Jun 17, 2025
bf9e2fa
Merge branch 'main' of github.com:DataTools4Heart/flcore into main
J-Fabila Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion client_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,21 @@
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")

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"))

Expand Down
7 changes: 7 additions & 0 deletions server_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading