Skip to content

Commit 8e6c19f

Browse files
popescu-vpopescu-v
committed
End path statements with comments in scenarios
See the comment KhiopsML/khiops#626 (comment) of Khiops core issue KhiopsML/khiops#626 for the full rationale.
1 parent d359b52 commit 8e6c19f

File tree

48 files changed

+175
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+175
-174
lines changed

‎khiops/core/internals/task.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
def encode_path_valued_arg(arg, arg_name, arg_type):
2424
"""Encodes an argument containing paths (str or dict)
25+
Adds trailing comment for ensuring URI parsing by Khiops.
2526
2627
Parameters
2728
----------
@@ -43,11 +44,11 @@ def encode_path_valued_arg(arg, arg_name, arg_type):
4344
):
4445
raise TypeError(type_error_message(arg_name, arg, str, bytes, "dict-str-str"))
4546
if issubclass(arg_type, StringLikeType):
46-
encoded_arg = encode_file_path(arg)
47+
encoded_arg = encode_file_path(arg) + b" //"
4748
else:
4849
encoded_arg = {}
4950
for key in arg.keys():
50-
encoded_arg[key] = encode_file_path(arg[key])
51+
encoded_arg[key] = encode_file_path(arg[key]) + b" //"
5152
return encoded_arg
5253

5354

‎tests/resources/scenario_generation/api/build_deployed_dictionary/ref/Adult._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Scenario for task build_deployed_dictionary
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName Adult.kdic
4+
ClassFileName Adult.kdic //
55
OK
66

77
// Transfer settings
88
LearningTools.TransferDatabase
99
ClassName Adult
1010
BuildTransferredClass
11-
ClassFileName AdultDeployed.kdic
11+
ClassFileName AdultDeployed.kdic //
1212
OK
1313
Exit
1414

‎tests/resources/scenario_generation/api/build_deployed_dictionary/ref/Customer._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Scenario for task build_deployed_dictionary
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName Customer.kdic
4+
ClassFileName Customer.kdic //
55
OK
66

77
// Transfer settings
88
LearningTools.TransferDatabase
99
ClassName Customer
1010
BuildTransferredClass
11-
ClassFileName CustomerDeployed.kdic
11+
ClassFileName CustomerDeployed.kdic //
1212
OK
1313
Exit
1414

‎tests/resources/scenario_generation/api/build_deployed_dictionary/ref/SpliceJunction._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Scenario for task build_deployed_dictionary
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName SpliceJunction.kdic
4+
ClassFileName SpliceJunction.kdic //
55
OK
66

77
// Transfer settings
88
LearningTools.TransferDatabase
99
ClassName SpliceJunction
1010
BuildTransferredClass
11-
ClassFileName SpliceJunctionDeployed.kdic
11+
ClassFileName SpliceJunctionDeployed.kdic //
1212
OK
1313
Exit
1414

‎tests/resources/scenario_generation/api/build_dictionary_from_data_table/ref/Adult._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Dictionary building settings
33
ClassManagement.ManageClasses
44
BuildClassDefButton
5-
SourceDataTable.DatabaseSpec.Data.DatabaseName Adult.csv
5+
SourceDataTable.DatabaseSpec.Data.DatabaseName Adult.csv //
66
SourceDataTable.DatabaseSpec.Data.HeaderLineUsed true
77
SourceDataTable.DatabaseSpec.Data.FieldSeparator
88
SourceDataTable.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat
@@ -12,7 +12,7 @@ OK
1212
Exit
1313

1414
// Save dictionary
15-
ClassFileName Adult.kdic
15+
ClassFileName Adult.kdic //
1616
OK
1717
Exit
1818

‎tests/resources/scenario_generation/api/build_dictionary_from_data_table/ref/Customer._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Dictionary building settings
33
ClassManagement.ManageClasses
44
BuildClassDefButton
5-
SourceDataTable.DatabaseSpec.Data.DatabaseName Customer.csv
5+
SourceDataTable.DatabaseSpec.Data.DatabaseName Customer.csv //
66
SourceDataTable.DatabaseSpec.Data.HeaderLineUsed true
77
SourceDataTable.DatabaseSpec.Data.FieldSeparator
88
SourceDataTable.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat
@@ -12,7 +12,7 @@ OK
1212
Exit
1313

1414
// Save dictionary
15-
ClassFileName Customer.kdic
15+
ClassFileName Customer.kdic //
1616
OK
1717
Exit
1818

‎tests/resources/scenario_generation/api/build_dictionary_from_data_table/ref/SpliceJunction._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Dictionary building settings
33
ClassManagement.ManageClasses
44
BuildClassDefButton
5-
SourceDataTable.DatabaseSpec.Data.DatabaseName SpliceJunction.csv
5+
SourceDataTable.DatabaseSpec.Data.DatabaseName SpliceJunction.csv //
66
SourceDataTable.DatabaseSpec.Data.HeaderLineUsed true
77
SourceDataTable.DatabaseSpec.Data.FieldSeparator
88
SourceDataTable.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat
@@ -12,7 +12,7 @@ OK
1212
Exit
1313

1414
// Save dictionary
15-
ClassFileName SpliceJunction.kdic
15+
ClassFileName SpliceJunction.kdic //
1616
OK
1717
Exit
1818

‎tests/resources/scenario_generation/api/check_database/ref/Adult._kh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Scenario for task check_database
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName Adult.kdic
4+
ClassFileName Adult.kdic //
55
OK
66

77
// Train database settings
88
TrainDatabase.ClassName Adult
99
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key
10-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName Adult.csv
10+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName Adult.csv //
1111
TrainDatabase.DatabaseSpec.Data.HeaderLineUsed true
1212
TrainDatabase.DatabaseSpec.Data.FieldSeparator
1313
TrainDatabase.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat

‎tests/resources/scenario_generation/api/check_database/ref/Customer._kh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
// Scenario for task check_database
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName Customer.kdic
4+
ClassFileName Customer.kdic //
55
OK
66

77
// Train database settings
88
TrainDatabase.ClassName Customer
99
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key
10-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName Customer.csv
10+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName Customer.csv //
1111
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key Services
12-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName ServicesBidon.csv
12+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName ServicesBidon.csv //
1313
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key Services/Usages
14-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName UsagesBidon.csv
14+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName UsagesBidon.csv //
1515
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key Address
16-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName AddressBidon.csv
16+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName AddressBidon.csv //
1717
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key /City
18-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName CityBidon.csv
18+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName CityBidon.csv //
1919
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key /Country
20-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName CountryBidon.csv
20+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName CountryBidon.csv //
2121
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key /Product
22-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName ProductBidon.csv
22+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName ProductBidon.csv //
2323
TrainDatabase.DatabaseSpec.Data.HeaderLineUsed true
2424
TrainDatabase.DatabaseSpec.Data.FieldSeparator
2525
TrainDatabase.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat

‎tests/resources/scenario_generation/api/check_database/ref/SpliceJunction._kh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Scenario for task check_database
22
// Dictionary file and class settings
33
ClassManagement.OpenFile
4-
ClassFileName SpliceJunction.kdic
4+
ClassFileName SpliceJunction.kdic //
55
OK
66

77
// Train database settings
88
TrainDatabase.ClassName SpliceJunction
99
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key
10-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName SpliceJunction.csv
10+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName SpliceJunction.csv //
1111
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.List.Key DNA
12-
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName SpliceJunctionDNABidon.csv
12+
TrainDatabase.DatabaseSpec.Data.DatabaseFiles.DataTableName SpliceJunctionDNABidon.csv //
1313
TrainDatabase.DatabaseSpec.Data.HeaderLineUsed true
1414
TrainDatabase.DatabaseSpec.Data.FieldSeparator
1515
TrainDatabase.DatabaseSpec.Data.DatabaseFormatDetector.DetectFileFormat

0 commit comments

Comments
 (0)