Skip to content

Commit a8b7d40

Browse files
authored
using suggestion from @noopurintel
1 parent b94e79b commit a8b7d40

1 file changed

Lines changed: 69 additions & 70 deletions

File tree

testing/test_full.py

Lines changed: 69 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -152,77 +152,76 @@ def prerequisites_constructTrainingCSV():
152152
os.remove(os.path.join(inputDir, item))
153153

154154
for application_data in os.listdir(inputDir):
155-
if "segmentation" in application_data:
156-
# this is to ensure other types of unit-testing data do not inadvertently get pulled in during testing
157-
currentApplicationDir = os.path.join(inputDir, application_data)
158-
159-
if "2d_rad_segmentation" in application_data:
160-
channelsID = "image.png"
161-
labelID = "mask.png"
162-
elif "3d_rad_segmentation" in application_data:
163-
channelsID = "image"
164-
labelID = "mask"
165-
elif "2d_histo_segmentation" in application_data:
166-
channelsID = "image"
167-
labelID = "mask"
168-
# else:
169-
# continue
170-
outputFile = inputDir + "/train_" + application_data + ".csv"
171-
outputFile_rel = inputDir + "/train_" + application_data + "_relative.csv"
172-
# Test with various combinations of relative/absolute paths
173-
# Absolute input/output
174-
writeTrainingCSV(
175-
currentApplicationDir,
176-
channelsID,
177-
labelID,
178-
outputFile,
179-
relativizePathsToOutput=False,
180-
)
181-
writeTrainingCSV(
182-
currentApplicationDir,
183-
channelsID,
184-
labelID,
185-
outputFile_rel,
186-
relativizePathsToOutput=True,
187-
)
155+
if "segmentation" not in application_data:
156+
continue
157+
# this is to ensure other types of unit-testing data do not inadvertently get pulled in during testing
158+
currentApplicationDir = os.path.join(inputDir, application_data)
159+
160+
if "2d_rad_segmentation" in application_data:
161+
channelsID = "image.png"
162+
labelID = "mask.png"
163+
elif "3d_rad_segmentation" in application_data:
164+
channelsID = "image"
165+
labelID = "mask"
166+
elif "2d_histo_segmentation" in application_data:
167+
channelsID = "image"
168+
labelID = "mask"
169+
# else:
170+
# continue
171+
outputFile = inputDir + "/train_" + application_data + ".csv"
172+
outputFile_rel = inputDir + "/train_" + application_data + "_relative.csv"
173+
# Test with various combinations of relative/absolute paths
174+
# Absolute input/output
175+
writeTrainingCSV(
176+
currentApplicationDir,
177+
channelsID,
178+
labelID,
179+
outputFile,
180+
relativizePathsToOutput=False,
181+
)
182+
writeTrainingCSV(
183+
currentApplicationDir,
184+
channelsID,
185+
labelID,
186+
outputFile_rel,
187+
relativizePathsToOutput=True,
188+
)
188189

189-
# write regression and classification files
190-
application_data_regression = application_data.replace(
191-
"segmentation", "regression"
192-
)
193-
application_data_classification = application_data.replace(
194-
"segmentation", "classification"
195-
)
196-
with open(
197-
inputDir + "/train_" + application_data + ".csv", "r"
198-
) as read_f, open(
199-
inputDir + "/train_" + application_data_regression + ".csv",
200-
"w",
201-
newline="",
202-
) as write_reg, open(
203-
inputDir + "/train_" + application_data_classification + ".csv",
204-
"w",
205-
newline="",
206-
) as write_class:
207-
csv_reader = csv.reader(read_f)
208-
csv_writer_1 = csv.writer(write_reg)
209-
csv_writer_2 = csv.writer(write_class)
210-
i = 0
211-
for row in csv_reader:
212-
if i == 0:
213-
row.append("ValueToPredict")
214-
csv_writer_2.writerow(row)
215-
# row.append('ValueToPredict_2')
216-
csv_writer_1.writerow(row)
217-
else:
218-
row_regression = copy.deepcopy(row)
219-
row_classification = copy.deepcopy(row)
220-
row_regression.append(str(random.uniform(0, 1)))
221-
# row_regression.append(str(random.uniform(0, 1)))
222-
row_classification.append(str(random.randint(0, 2)))
223-
csv_writer_1.writerow(row_regression)
224-
csv_writer_2.writerow(row_classification)
225-
i += 1
190+
# write regression and classification files
191+
application_data_regression = application_data.replace(
192+
"segmentation", "regression"
193+
)
194+
application_data_classification = application_data.replace(
195+
"segmentation", "classification"
196+
)
197+
with open(
198+
inputDir + "/train_" + application_data + ".csv", "r"
199+
) as read_f, open(
200+
inputDir + "/train_" + application_data_regression + ".csv", "w", newline=""
201+
) as write_reg, open(
202+
inputDir + "/train_" + application_data_classification + ".csv",
203+
"w",
204+
newline="",
205+
) as write_class:
206+
csv_reader = csv.reader(read_f)
207+
csv_writer_1 = csv.writer(write_reg)
208+
csv_writer_2 = csv.writer(write_class)
209+
i = 0
210+
for row in csv_reader:
211+
if i == 0:
212+
row.append("ValueToPredict")
213+
csv_writer_2.writerow(row)
214+
# row.append('ValueToPredict_2')
215+
csv_writer_1.writerow(row)
216+
else:
217+
row_regression = copy.deepcopy(row)
218+
row_classification = copy.deepcopy(row)
219+
row_regression.append(str(random.uniform(0, 1)))
220+
# row_regression.append(str(random.uniform(0, 1)))
221+
row_classification.append(str(random.randint(0, 2)))
222+
csv_writer_1.writerow(row_regression)
223+
csv_writer_2.writerow(row_classification)
224+
i += 1
226225

227226

228227
def test_prepare_data_for_ci():

0 commit comments

Comments
 (0)