Skip to content

Commit 3b0fdb2

Browse files
committed
Update sklearn tests
- propagate Core API updates to parameter passing tests - propagate secondary-table path update to sklearn tests
1 parent 0adabd7 commit 3b0fdb2

File tree

1 file changed

+16
-35
lines changed

1 file changed

+16
-35
lines changed

tests/test_sklearn.py

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -482,13 +482,19 @@ def setUpClass(cls):
482482
KhiopsCoclustering: {
483483
"fit": {
484484
("khiops.core", "prepare_coclustering_deployment"): {
485-
2: os.path.join(cls.output_dir, "Coclustering.khcj"),
485+
2: os.path.join(
486+
cls.output_dir, "main_tableCoclusteringResults.khcj"
487+
),
486488
3: "CC_main_table",
487489
4: "SampleId",
488-
5: cls.output_dir,
490+
5: os.path.join(
491+
cls.output_dir, "CC_Keys_main_table_deployed.kdic"
492+
),
489493
},
490494
("khiops.core", "read_coclustering_results_file"): {
491-
0: os.path.join(cls.output_dir, "Coclustering.khcj")
495+
0: os.path.join(
496+
cls.output_dir, "main_tableCoclusteringResults.khcj"
497+
)
492498
},
493499
("khiops.core", "train_coclustering"): {
494500
1: "main_table",
@@ -718,20 +724,7 @@ def setUpClass(cls):
718724
("khiops.core", "deploy_model"): {
719725
"detect_format": False,
720726
"header_line": True,
721-
"additional_data_tables": {
722-
"CC_Keys_main_table`CC_main_table"
723-
},
724-
"log_file_path": os.path.join(
725-
cls.output_dir, "khiops.log"
726-
),
727-
},
728-
("khiops.core", "extract_keys_from_data_table"): {
729-
"header_line": True,
730-
"output_header_line": True,
731-
},
732-
},
733-
},
734-
},
727+
"additional_data_tables": {"CC_main_table"},
735728
"log_file_path": os.path.join(
736729
cls.output_dir, "khiops.log"
737730
),
@@ -852,9 +845,7 @@ def setUpClass(cls):
852845
"all_possible_pairs": False,
853846
"construction_rules": ["TableMode", "TableSelection"],
854847
"group_target_value": False,
855-
"additional_data_tables": {
856-
"SpliceJunction`SpliceJunctionDNA"
857-
},
848+
"additional_data_tables": {"SpliceJunctionDNA"},
858849
}
859850
},
860851
"predict": {
@@ -865,9 +856,7 @@ def setUpClass(cls):
865856
"log_file_path": os.path.join(
866857
cls.output_dir, "khiops.log"
867858
),
868-
"additional_data_tables": {
869-
"SNB_SpliceJunction`SpliceJunctionDNA"
870-
},
859+
"additional_data_tables": {"SpliceJunctionDNA"},
871860
}
872861
},
873862
},
@@ -882,9 +871,7 @@ def setUpClass(cls):
882871
"max_selected_variables": 1,
883872
"max_evaluated_variables": 3,
884873
"construction_rules": ["TableMode", "TableSelection"],
885-
"additional_data_tables": {
886-
"SpliceJunction`SpliceJunctionDNA"
887-
},
874+
"additional_data_tables": {"SpliceJunctionDNA"},
888875
}
889876
},
890877
"predict": {
@@ -895,9 +882,7 @@ def setUpClass(cls):
895882
"log_file_path": os.path.join(
896883
cls.output_dir, "khiops.log"
897884
),
898-
"additional_data_tables": {
899-
"SNB_SpliceJunction`SpliceJunctionDNA"
900-
},
885+
"additional_data_tables": {"SpliceJunctionDNA"},
901886
}
902887
},
903888
},
@@ -920,9 +905,7 @@ def setUpClass(cls):
920905
"categorical_recoding_method": "part Id",
921906
"numerical_recoding_method": "part Id",
922907
"pairs_recoding_method": "part Id",
923-
"additional_data_tables": {
924-
"SpliceJunction`SpliceJunctionDNA"
925-
},
908+
"additional_data_tables": {"SpliceJunctionDNA"},
926909
}
927910
},
928911
"predict": {
@@ -933,9 +916,7 @@ def setUpClass(cls):
933916
"log_file_path": os.path.join(
934917
cls.output_dir, "khiops.log"
935918
),
936-
"additional_data_tables": {
937-
"R_SpliceJunction`SpliceJunctionDNA"
938-
},
919+
"additional_data_tables": {"SpliceJunctionDNA"},
939920
}
940921
},
941922
},

0 commit comments

Comments
 (0)