From 612735aaae27f32d2d4276af7288bd7c473fc60a Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Fri, 21 Oct 2022 16:35:45 +0100
Subject: [PATCH] rename shuffle arg

---
 aimodel/src/lib/dataset/dataset.py           | 6 +++---
 aimodel/src/lib/dataset/dataset_segmenter.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aimodel/src/lib/dataset/dataset.py b/aimodel/src/lib/dataset/dataset.py
index da78de4..3c3b087 100644
--- a/aimodel/src/lib/dataset/dataset.py
+++ b/aimodel/src/lib/dataset/dataset.py
@@ -66,12 +66,12 @@ def make_dataset(filepaths, metadata, shape_watch_desired=[100,100], compression
 	return dataset
 
 
-def get_filepaths(dirpath_input, shuffle=True):
+def get_filepaths(dirpath_input, do_shuffle=True):
 	result = list(filter(
 		lambda filepath: str(filepath).endswith(".tfrecord.gz"),
 		[ file.path for file in os.scandir(dirpath_input) ] # .path on a DirEntry object yields the absolute filepath
 	))
-	if shuffle:
+	if do_shuffle:
 		result = shuffle(result)
 	else:
 		result = sorted(result, key=lambda filepath: int(os.path.basename(filepath).split(".", 1)[0]))
@@ -105,7 +105,7 @@ def dataset_predict(dirpath_input, parallel_reads_multiplier=1.5, prefetch=True)
 	Returns:
 		tf.data.Dataset: A tensorflow Dataset for the given input files.
 	"""
-	filepaths = get_filepaths(dirpath_input, shuffle=False) if os.path.isdir(dirpath_input) else [ dirpath_input ]
+	filepaths = get_filepaths(dirpath_input, do_shuffle=False) if os.path.isdir(dirpath_input) else [ dirpath_input ]
 	
 	return make_dataset(
 		filepaths=filepaths,
diff --git a/aimodel/src/lib/dataset/dataset_segmenter.py b/aimodel/src/lib/dataset/dataset_segmenter.py
index e472cab..824a1fc 100644
--- a/aimodel/src/lib/dataset/dataset_segmenter.py
+++ b/aimodel/src/lib/dataset/dataset_segmenter.py
@@ -63,12 +63,12 @@ def make_dataset(filepaths, metadata, shape_water_desired=[100,100], water_thres
 	return dataset
 
 
-def get_filepaths(dirpath_input, shuffle=True):
+def get_filepaths(dirpath_input, do_shuffle=True):
 	result = list(filter(
 		lambda filepath: str(filepath).endswith(".tfrecord.gz"),
 		[ file.path for file in os.scandir(dirpath_input) ] # .path on a DirEntry object yields the absolute filepath
 	))
-	if shuffle:
+	if do_shuffle:
 		result = shuffle(result)
 	else:
 		result = sorted(result, key=lambda filepath: int(os.path.basename(filepath).split(".", 1)[0]))
@@ -102,7 +102,7 @@ def dataset_predict(dirpath_input, parallel_reads_multiplier=1.5, prefetch=True,
 	Returns:
 		tf.data.Dataset: A tensorflow Dataset for the given input files.
 	"""
-	filepaths = get_filepaths(dirpath_input, shuffle=False) if os.path.isdir(dirpath_input) else [ dirpath_input ]
+	filepaths = get_filepaths(dirpath_input, do_shuffle=False) if os.path.isdir(dirpath_input) else [ dirpath_input ]
 	
 	return make_dataset(
 		filepaths=filepaths,