megadetector 5.0.12__py3-none-any.whl → 5.0.14__py3-none-any.whl

megadetector/postprocessing/repeat_detection_elimination/repeat_detections_core.py

@@ -66,247 +66,251 @@ class RepeatDetectionOptions:
     """
     Options that control the behavior of repeat detection elimination
     """
+
+    def __init__(self):
+        
+        #: Folder where images live; filenames in the MD results .json file should
+        #: be relative to this folder.
+        #:
+        #: imageBase can also be a SAS URL, in which case some error-checking is
+        #: disabled.
+        self.imageBase = ''
+        
+        #: Folder where we should write temporary output.
+        self.outputBase = ''
     
-    #: Folder where images live; filenames in the MD results .json file should
-    #: be relative to this folder.
-    #:
-    #: imageBase can also be a SAS URL, in which case some error-checking is
-    #: disabled.
-    imageBase = ''
+        #: Don't consider detections with confidence lower than this as suspicious
+        self.confidenceMin = 0.1
+    
+        #: Don't consider detections with confidence higher than this as suspicious
+        self.confidenceMax = 1.0
     
-    #: Folder where we should write temporary output.
-    outputBase = ''
-
-    #: Don't consider detections with confidence lower than this as suspicious
-    confidenceMin = 0.1
-
-    #: Don't consider detections with confidence higher than this as suspicious
-    confidenceMax = 1.0
-
-    #: What's the IOU threshold for considering two boxes the same?
-    iouThreshold = 0.9
-
-    #: How many occurrences of a single location (as defined by the IOU threshold)
-    #: are required before we declare it suspicious?
-    occurrenceThreshold = 20
-    
-    #: Ignore "suspicious" detections smaller than some size
-    minSuspiciousDetectionSize = 0.0
-
-    #: Ignore "suspicious" detections larger than some size; these are often animals
-    #: taking up the whole image.  This is expressed as a fraction of the image size.
-    maxSuspiciousDetectionSize = 0.2
-
-    #: Ignore folders with more than this many images in them
-    maxImagesPerFolder = None
-    
-    #: A list of category IDs (ints) that we don't want consider as candidate repeat detections.
-    #:
-    #: Typically used to say, e.g., "don't bother analyzing people or vehicles for repeat 
-    #: detections", which you could do by saying excludeClasses = [2,3].
-    excludeClasses = []
-
-    #: For very large sets of results, passing chunks of results to and from workers as 
-    #: parameters ('memory') can be memory-intensive, so we can serialize to intermediate
-    #: files instead ('file').
-    #:
-    #: The use of 'file' here is still experimental.
-    pass_detections_to_processes_method = 'memory'
-    
-    #: Number of workers to use for parallel operations
-    nWorkers = 10
-    
-    #: Should we use threads (True) or processes (False) for parallelization?
-    #:
-    #: Not relevant if nWorkers <= 1, or if bParallelizeComparisons and 
-    #: bParallelizeRendering are both False.
-    parallelizationUsesThreads = True
-
-    #: If this is not empty, we'll load detections from a filter file rather than finding them 
-    #: from the detector output.  This should be a .json file containing detections, generally this 
-    #: is the detectionIndex.json file in the filtering_* folder produced by find_repeat_detections().
-    filterFileToLoad = ''
-
-    #: (optional) List of filenames remaining after deletion of identified 
-    #: repeated detections that are actually animals.  This should be a flat
-    #: text file, one relative filename per line.
-    #:
-    #: This is a pretty esoteric code path and a candidate for removal.
-    #:
-    #: The scenario where I see it being most useful is the very hypothetical one
-    #: where we use an external tool for image handling that allows us to do something
-    #: smarter and less destructive than deleting images to mark them as non-false-positives.
-    filteredFileListToLoad = None
-
-    #: Should we write the folder of images used to manually review repeat detections?
-    bWriteFilteringFolder = True
-
-    #: For debugging: limit comparisons to a specific number of folders
-    debugMaxDir = -1
-    
-    #: For debugging: limit rendering to a specific number of folders
-    debugMaxRenderDir = -1
-    
-    #: For debugging: limit comparisons to a specific number of detections
-    debugMaxRenderDetection = -1
-    
-    #: For debugging: limit comparisons to a specific number of instances
-    debugMaxRenderInstance = -1
-    
-    #: Should we parallelize (across cameras) comparisons to find repeat detections?
-    bParallelizeComparisons = True
-    
-    #: Should we parallelize image rendering?
-    bParallelizeRendering = True
-    
-    #: If this is False (default), a detection from class A is *not* considered to be "the same"
-    #: as a detection from class B, even if they're at the same location.
-    categoryAgnosticComparisons = False
-    
-    #: Determines whether bounding-box rendering errors (typically network errors) should
-    #: be treated as failures    
-    bFailOnRenderError = False
-    
-    #: Should we print a warning if images referred to in the MD results file are missing?
-    bPrintMissingImageWarnings = True
-    
-    #: If bPrintMissingImageWarnings is True, should we print a warning about missing images
-    #: just once ('once') or every time ('all')?
-    missingImageWarningType = 'once'  # 'all'
-
-    #: Image width for rendered images (it's called "max" because we don't resize smaller images).
-    #:
-    #: Original size is preserved if this is None.
-    #:
-    #: This does *not* include the tile image grid.
-    maxOutputImageWidth = None
-    
-    #: Line thickness (in pixels) for box rendering
-    lineThickness = 10
-    
-    #: Box expansion (in pixels)
-    boxExpansion = 2
-    
-    #: Progress bar used during comparisons and rendering.  Do not set externally.
-    #:
-    #: :meta private:
-    pbar = None
-
-    #: Replace filename tokens after reading, useful when the directory structure
-    #: has changed relative to the structure the detector saw.
-    filenameReplacements = {}
-
-    #: How many folders up from the leaf nodes should we be going to aggregate images into 
-    #: cameras?
-    #:
-    #: If this is zero, each leaf folder is treated as a camera.
-    nDirLevelsFromLeaf = 0
-    
-    #: An optional function that takes a string (an image file name) and returns
-    #: a string (the corresponding  folder ID), typically used when multiple folders
-    #: actually correspond to the same camera in a manufacturer-specific way (e.g.
-    #: a/b/c/RECONYX100 and a/b/c/RECONYX101 may really be the same camera).
-    #:
-    #: See ct_utils for a common replacement function that handles most common
-    #: manufacturer folder names.
-    customDirNameFunction = None
-    
-    #: Include only specific folders, mutually exclusive with [excludeFolders]
-    includeFolders = None
-    
-    #: Exclude specific folders, mutually exclusive with [includeFolders]
-    excludeFolders = None
-
-    #: Optionally show *other* detections (i.e., detections other than the
-    #: one the user is evaluating), typically in a light gray.
-    bRenderOtherDetections = False
-    
-    #: Threshold to use for *other* detections
-    otherDetectionsThreshold = 0.2    
-    
-    #: Line width (in pixels) for *other* detections
-    otherDetectionsLineWidth = 1
-    
-    #: Optionally show a grid that includes a sample image for the detection, plus
-    #: the top N additional detections
-    bRenderDetectionTiles = True
-    
-    #: Width of the original image (within the larger output image) when bRenderDetectionTiles
-    #: is True.
-    #:
-    #: If this is None, we'll render the original image in the detection tile image
-    #: at its original width.
-    detectionTilesPrimaryImageWidth = None
-    
-    #: Width to use for the grid of detection instances.
-    #:
-    #: Can be a width in pixels, or a number from 0 to 1 representing a fraction
-    #: of the primary image width.
-    #:
-    #: If you want to render the grid at exactly 1 pixel wide, I guess you're out
-    #: of luck.    
-    detectionTilesCroppedGridWidth = 0.6
-    
-    #: Location of the primary image within the mosaic ('right' or 'left)
-    detectionTilesPrimaryImageLocation = 'right'
-    
-    #: Maximum number of individual detection instances to include in the mosaic
-    detectionTilesMaxCrops = 250
-    
-    #: If bRenderOtherDetections is True, what color should we use to render the
-    #: (hopefully pretty subtle) non-target detections?
-    #: 
-    #: In theory I'd like these "other detection" rectangles to be partially 
-    #: transparent, but this is not straightforward, and the alpha is ignored
-    #: here.  But maybe if I leave it here and wish hard enough, someday it 
-    #: will work.
-    #:
-    #: otherDetectionsColors = ['dimgray']
-    otherDetectionsColors = [(105,105,105,100)]
-    
-    #: Sort detections within a directory so nearby detections are adjacent
-    #: in the list, for faster review.
-    #:
-    #: Can be None, 'xsort', or 'clustersort'
-    #:
-    #: * None sorts detections chronologically by first occurrence
-    #: * 'xsort' sorts detections from left to right
-    #: * 'clustersort' clusters detections and sorts by cluster
-    smartSort = 'xsort'
-    
-    #: Only relevant if smartSort == 'clustersort'
-    smartSortDistanceThreshold = 0.1
+        #: What's the IOU threshold for considering two boxes the same?
+        self.iouThreshold = 0.9
     
+        #: How many occurrences of a single location (as defined by the IOU threshold)
+        #: are required before we declare it suspicious?
+        self.occurrenceThreshold = 20
+        
+        #: Ignore "suspicious" detections smaller than some size
+        self.minSuspiciousDetectionSize = 0.0
+    
+        #: Ignore "suspicious" detections larger than some size; these are often animals
+        #: taking up the whole image.  This is expressed as a fraction of the image size.
+        self.maxSuspiciousDetectionSize = 0.2
+    
+        #: Ignore folders with more than this many images in them
+        self.maxImagesPerFolder = None
+        
+        #: A list of category IDs (ints) that we don't want consider as candidate repeat detections.
+        #:
+        #: Typically used to say, e.g., "don't bother analyzing people or vehicles for repeat 
+        #: detections", which you could do by saying excludeClasses = [2,3].
+        self.excludeClasses = []
+    
+        #: For very large sets of results, passing chunks of results to and from workers as 
+        #: parameters ('memory') can be memory-intensive, so we can serialize to intermediate
+        #: files instead ('file').
+        #:
+        #: The use of 'file' here is still experimental.
+        self.pass_detections_to_processes_method = 'memory'
+        
+        #: Number of workers to use for parallel operations
+        self.nWorkers = 10
+        
+        #: Should we use threads (True) or processes (False) for parallelization?
+        #:
+        #: Not relevant if nWorkers <= 1, or if bParallelizeComparisons and 
+        #: bParallelizeRendering are both False.
+        self.parallelizationUsesThreads = True
+    
+        #: If this is not empty, we'll load detections from a filter file rather than finding them 
+        #: from the detector output.  This should be a .json file containing detections, generally this 
+        #: is the detectionIndex.json file in the filtering_* folder produced by find_repeat_detections().
+        self.filterFileToLoad = ''
+    
+        #: (optional) List of filenames remaining after deletion of identified 
+        #: repeated detections that are actually animals.  This should be a flat
+        #: text file, one relative filename per line.
+        #:
+        #: This is a pretty esoteric code path and a candidate for removal.
+        #:
+        #: The scenario where I see it being most useful is the very hypothetical one
+        #: where we use an external tool for image handling that allows us to do something
+        #: smarter and less destructive than deleting images to mark them as non-false-positives.
+        self.filteredFileListToLoad = None
+    
+        #: Should we write the folder of images used to manually review repeat detections?
+        self.bWriteFilteringFolder = True
+    
+        #: For debugging: limit comparisons to a specific number of folders
+        self.debugMaxDir = -1
+        
+        #: For debugging: limit rendering to a specific number of folders
+        self.debugMaxRenderDir = -1
+        
+        #: For debugging: limit comparisons to a specific number of detections
+        self.debugMaxRenderDetection = -1
+        
+        #: For debugging: limit comparisons to a specific number of instances
+        self.debugMaxRenderInstance = -1
+        
+        #: Should we parallelize (across cameras) comparisons to find repeat detections?
+        self.bParallelizeComparisons = True
+        
+        #: Should we parallelize image rendering?
+        self.bParallelizeRendering = True
+        
+        #: If this is False (default), a detection from class A is *not* considered to be "the same"
+        #: as a detection from class B, even if they're at the same location.
+        self.categoryAgnosticComparisons = False
+        
+        #: Determines whether bounding-box rendering errors (typically network errors) should
+        #: be treated as failures    
+        self.bFailOnRenderError = False
+        
+        #: Should we print a warning if images referred to in the MD results file are missing?
+        self.bPrintMissingImageWarnings = True
+        
+        #: If bPrintMissingImageWarnings is True, should we print a warning about missing images
+        #: just once ('once') or every time ('all')?
+        self.missingImageWarningType = 'once'  # 'all'
+    
+        #: Image width for rendered images (it's called "max" because we don't resize smaller images).
+        #:
+        #: Original size is preserved if this is None.
+        #:
+        #: This does *not* include the tile image grid.
+        self.maxOutputImageWidth = None
+        
+        #: Line thickness (in pixels) for box rendering
+        self.lineThickness = 10
+        
+        #: Box expansion (in pixels)
+        self.boxExpansion = 2
+        
+        #: Progress bar used during comparisons and rendering.  Do not set externally.
+        #:
+        #: :meta private:
+        self.pbar = None
+    
+        #: Replace filename tokens after reading, useful when the directory structure
+        #: has changed relative to the structure the detector saw.
+        self.filenameReplacements = {}
+    
+        #: How many folders up from the leaf nodes should we be going to aggregate images into 
+        #: cameras?
+        #:
+        #: If this is zero, each leaf folder is treated as a camera.
+        self.nDirLevelsFromLeaf = 0
+        
+        #: An optional function that takes a string (an image file name) and returns
+        #: a string (the corresponding  folder ID), typically used when multiple folders
+        #: actually correspond to the same camera in a manufacturer-specific way (e.g.
+        #: a/b/c/RECONYX100 and a/b/c/RECONYX101 may really be the same camera).
+        #:
+        #: See ct_utils for a common replacement function that handles most common
+        #: manufacturer folder names.
+        self.customDirNameFunction = None
+        
+        #: Include only specific folders, mutually exclusive with [excludeFolders]
+        self.includeFolders = None
+        
+        #: Exclude specific folders, mutually exclusive with [includeFolders]
+        self.excludeFolders = None
+    
+        #: Optionally show *other* detections (i.e., detections other than the
+        #: one the user is evaluating), typically in a light gray.
+        self.bRenderOtherDetections = False
+        
+        #: Threshold to use for *other* detections
+        self.otherDetectionsThreshold = 0.2    
+        
+        #: Line width (in pixels) for *other* detections
+        self.otherDetectionsLineWidth = 1
+        
+        #: Optionally show a grid that includes a sample image for the detection, plus
+        #: the top N additional detections
+        self.bRenderDetectionTiles = True
+        
+        #: Width of the original image (within the larger output image) when bRenderDetectionTiles
+        #: is True.
+        #:
+        #: If this is None, we'll render the original image in the detection tile image
+        #: at its original width.
+        self.detectionTilesPrimaryImageWidth = None
+        
+        #: Width to use for the grid of detection instances.
+        #:
+        #: Can be a width in pixels, or a number from 0 to 1 representing a fraction
+        #: of the primary image width.
+        #:
+        #: If you want to render the grid at exactly 1 pixel wide, I guess you're out
+        #: of luck.    
+        self.detectionTilesCroppedGridWidth = 0.6
+        
+        #: Location of the primary image within the mosaic ('right' or 'left)
+        self.detectionTilesPrimaryImageLocation = 'right'
+        
+        #: Maximum number of individual detection instances to include in the mosaic
+        self.detectionTilesMaxCrops = 250
+        
+        #: If bRenderOtherDetections is True, what color should we use to render the
+        #: (hopefully pretty subtle) non-target detections?
+        #: 
+        #: In theory I'd like these "other detection" rectangles to be partially 
+        #: transparent, but this is not straightforward, and the alpha is ignored
+        #: here.  But maybe if I leave it here and wish hard enough, someday it 
+        #: will work.
+        #:
+        #: otherDetectionsColors = ['dimgray']
+        self.otherDetectionsColors = [(105,105,105,100)]
+        
+        #: Sort detections within a directory so nearby detections are adjacent
+        #: in the list, for faster review.
+        #:
+        #: Can be None, 'xsort', or 'clustersort'
+        #:
+        #: * None sorts detections chronologically by first occurrence
+        #: * 'xsort' sorts detections from left to right
+        #: * 'clustersort' clusters detections and sorts by cluster
+        self.smartSort = 'xsort'
+        
+        #: Only relevant if smartSort == 'clustersort'
+        self.smartSortDistanceThreshold = 0.1
+        
     
 class RepeatDetectionResults:
     """
     The results of an entire repeat detection analysis
     """
 
-    #: The data table (Pandas DataFrame), as loaded from the input json file via 
-    #: load_api_results().  Has columns ['file', 'detections','failure'].
-    detectionResults = None
-
-    #: The other fields in the input json file, loaded via load_api_results()
-    otherFields = None
-
-    #: The data table after modification
-    detectionResultsFiltered = None
-
-    #: dict mapping folder names to whole rows from the data table
-    rowsByDirectory = None
-
-    #: dict mapping filenames to rows in the master table
-    filenameToRow = None
-
-    #: An array of length nDirs, where each element is a list of DetectionLocation 
-    #: objects for that directory that have been flagged as suspicious
-    suspiciousDetections = None
-
-    #: The location of the .json file written with information about the RDE
-    #: review images (typically detectionIndex.json)
-    filterFile = None
-
+    def __init__(self):
+        
+        #: The data table (Pandas DataFrame), as loaded from the input json file via 
+        #: load_api_results().  Has columns ['file', 'detections','failure'].
+        self.detectionResults = None
+    
+        #: The other fields in the input json file, loaded via load_api_results()
+        self.otherFields = None
+    
+        #: The data table after modification
+        self.detectionResultsFiltered = None
+    
+        #: dict mapping folder names to whole rows from the data table
+        self.rowsByDirectory = None
+    
+        #: dict mapping filenames to rows in the master table
+        self.filenameToRow = None
+    
+        #: An array of length nDirs, where each element is a list of DetectionLocation 
+        #: objects for that directory that have been flagged as suspicious
+        self.suspiciousDetections = None
+    
+        #: The location of the .json file written with information about the RDE
+        #: review images (typically detectionIndex.json)
+        self.filterFile = None
+    
 
 class IndexedDetection:
     """

megadetector/postprocessing/subset_json_detector_output.py

@@ -72,68 +72,70 @@ class SubsetJsonDetectorOutputOptions:
     """
     Options used to parameterize subset_json_detector_output()
     """
-    
-    #: Only process files containing the token 'query'
-    query = None
-    
-    #: Replace 'query' with 'replacement' if 'replacement' is not None.  If 'query' is None,
-    #: prepend 'replacement'
-    replacement = None
-    
-    #: Should we split output into individual .json files for each folder?
-    split_folders = False
-    
-    #: Folder level to use for splitting ['bottom','top','n_from_bottom','n_from_top','dict']
-    #:
-    #: 'dict' requires 'split_folder_param' to be a dictionary mapping each filename
-    #: to a token.
-    split_folder_mode = 'bottom'  # 'top'
-    
-    #: When using the 'n_from_bottom' parameter to define folder splitting, this
-    #: defines the number of directories from the bottom.  'n_from_bottom' with
-    #: a parameter of zero is the same as 'bottom'.
-    #:
-    #: Same story with 'n_from_top'.
-    #:
-    #: When 'split_folder_mode' is 'dict', this should be a dictionary mapping each filename
-    #: to a token.
-    split_folder_param = 0
-    
-    #: Only meaningful if split_folders is True: should we convert pathnames to be relative
-    #: the folder for each .json file?
-    make_folder_relative = False
-    
-    #: Only meaningful if split_folders and make_folder_relative are True: if not None, 
-    #: will copy .json files to their corresponding output directories, relative to 
-    #: output_filename
-    copy_jsons_to_folders = False
-    
-    #: Should we over-write .json files?
-    overwrite_json_files = False
-    
-    #: If copy_jsons_to_folders is true, do we require that directories already exist?
-    copy_jsons_to_folders_directories_must_exist = True
-    
-    #: Optional confidence threshold; if not None, detections below this confidence won't be
-    #: included in the output.
-    confidence_threshold = None
-    
-    #: Should we remove failed images?
-    remove_failed_images = False
-    
-    #: Either a list of category IDs (as string-ints) (not names), or a dictionary mapping category *IDs* 
-    #: (as string-ints) (not names) to thresholds.  Removes  non-matching detections, does not 
-    #: remove images.  Not technically mutually exclusize with category_names_to_keep, but it's an esoteric 
-    #: scenario indeed where you would want to specify both.
-    categories_to_keep = None
-    
-    #: Either a list of category names (not IDs), or a dictionary mapping category *names* (not IDs) to thresholds.  
-    #: Removes non-matching detections, does not remove images.  Not technically mutually exclusize with 
-    #: category_ids_to_keep, but it's an esoteric scenario indeed where you would want to specify both.
-    category_names_to_keep = None
-    
-    #: Set to >0 during testing to limit the number of images that get processed.
-    debug_max_images = -1
+
+    def __init__(self):
+            
+        #: Only process files containing the token 'query'
+        self.query = None
+        
+        #: Replace 'query' with 'replacement' if 'replacement' is not None.  If 'query' is None,
+        #: prepend 'replacement'
+        self.replacement = None
+        
+        #: Should we split output into individual .json files for each folder?
+        self.split_folders = False
+        
+        #: Folder level to use for splitting ['bottom','top','n_from_bottom','n_from_top','dict']
+        #:
+        #: 'dict' requires 'split_folder_param' to be a dictionary mapping each filename
+        #: to a token.
+        self.split_folder_mode = 'bottom'  # 'top'
+        
+        #: When using the 'n_from_bottom' parameter to define folder splitting, this
+        #: defines the number of directories from the bottom.  'n_from_bottom' with
+        #: a parameter of zero is the same as 'bottom'.
+        #:
+        #: Same story with 'n_from_top'.
+        #:
+        #: When 'split_folder_mode' is 'dict', this should be a dictionary mapping each filename
+        #: to a token.
+        self.split_folder_param = 0
+        
+        #: Only meaningful if split_folders is True: should we convert pathnames to be relative
+        #: the folder for each .json file?
+        self.make_folder_relative = False
+        
+        #: Only meaningful if split_folders and make_folder_relative are True: if not None, 
+        #: will copy .json files to their corresponding output directories, relative to 
+        #: output_filename
+        self.copy_jsons_to_folders = False
+        
+        #: Should we over-write .json files?
+        self.overwrite_json_files = False
+        
+        #: If copy_jsons_to_folders is true, do we require that directories already exist?
+        self.copy_jsons_to_folders_directories_must_exist = True
+        
+        #: Optional confidence threshold; if not None, detections below this confidence won't be
+        #: included in the output.
+        self.confidence_threshold = None
+        
+        #: Should we remove failed images?
+        self.remove_failed_images = False
+        
+        #: Either a list of category IDs (as string-ints) (not names), or a dictionary mapping category *IDs* 
+        #: (as string-ints) (not names) to thresholds.  Removes  non-matching detections, does not 
+        #: remove images.  Not technically mutually exclusize with category_names_to_keep, but it's an esoteric 
+        #: scenario indeed where you would want to specify both.
+        self.categories_to_keep = None
+        
+        #: Either a list of category names (not IDs), or a dictionary mapping category *names* (not IDs) to thresholds.  
+        #: Removes non-matching detections, does not remove images.  Not technically mutually exclusize with 
+        #: category_ids_to_keep, but it's an esoteric scenario indeed where you would want to specify both.
+        self.category_names_to_keep = None
+        
+        #: Set to >0 during testing to limit the number of images that get processed.
+        self.debug_max_images = -1
     
     
 #%% Main function
@@ -466,6 +468,8 @@ def subset_json_detector_output(input_filename, output_filename, options, data=N
     
     if options is None:    
         options = SubsetJsonDetectorOutputOptions()
+    else:
+        options = copy.deepcopy(options)
             
     # Input validation        
     if options.copy_jsons_to_folders:

megadetector/taxonomy_mapping/preview_lila_taxonomy.py

@@ -397,8 +397,6 @@ images_per_query = 15
 min_valid_images_per_query = 3
 min_valid_image_size = 3000
 
-# TODO: trivially prallelizable
-#
 # i_row = 0; row = df.iloc[i_row]
 for i_row,row in df.iterrows():
     

megadetector/utils/ct_utils.py

@@ -117,7 +117,8 @@ def pretty_print_object(obj, b_print=True):
 
     # _ = pretty_print_object(obj)
 
-    # TODO: it's sloppy that I'm making a module-wide change here.
+    # TODO: it's sloppy that I'm making a module-wide change here, consider at least
+    # recording these operations and re-setting them at the end of this function.
     jsonpickle.set_encoder_options('json', sort_keys=True, indent=2)
     a = jsonpickle.encode(obj)
     s = '{}'.format(a)
@@ -360,9 +361,9 @@ def rect_distance(r1, r2, format='x0y0x1y1'):
 
 def split_list_into_fixed_size_chunks(L,n):
     """
-    Split the list or tuple L into chunks of size n (allowing chunks of size n-1 if necessary,
-    i.e. len(L) does not have to be a multiple of n).
-    
+    Split the list or tuple L into chunks of size n (allowing at most one chunk with size 
+    less than N, i.e. len(L) does not have to be a multiple of n).
+        
     Args:
         L (list): list to split into chunks
         n (int): preferred chunk size