risk-network 0.0.8b2__tar.gz → 0.0.8b4__tar.gz

{risk_network-0.0.8b2 → risk_network-0.0.8b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: risk-network
-Version: 0.0.8b2
+Version: 0.0.8b4
 Summary: A Python package for biological network analysis
 Author: Ira Horecka
 Author-email: Ira Horecka <ira89@icloud.com>

{risk_network-0.0.8b2 → risk_network-0.0.8b4}/risk/__init__.py

@@ -7,4 +7,4 @@ RISK: RISK Infers Spatial Kinships
 
 from risk.risk import RISK
 
-__version__ = "0.0.8-beta.2"
+__version__ = "0.0.8-beta.4"

{risk_network-0.0.8b2 → risk_network-0.0.8b4}/risk/network/plot.py

@@ -3,7 +3,6 @@ risk/network/plot
 ~~~~~~~~~~~~~~~~~
 """
 
-from functools import lru_cache
 from typing import Any, Dict, List, Tuple, Union
 
 import matplotlib.colors as mcolors
@@ -18,6 +17,8 @@ from scipy.stats import gaussian_kde
 from risk.log import params, logger
 from risk.network.graph import NetworkGraph
 
+TERM_DELIMITER = "::::"  # String used to separate multiple domain terms when constructing composite domain labels
+
 
 class NetworkPlotter:
     """A class for visualizing network graphs with customizable options.
@@ -679,10 +680,10 @@ class NetworkPlotter:
         arrow_base_shrink: float = 0.0,
         arrow_tip_shrink: float = 0.0,
         max_labels: Union[int, None] = None,
-        max_words: int = 10,
-        min_words: int = 1,
-        max_word_length: int = 20,
-        min_word_length: int = 1,
+        max_label_lines: Union[int, None] = None,
+        min_label_lines: int = 1,
+        max_chars_per_line: Union[int, None] = None,
+        min_chars_per_line: int = 1,
         words_to_omit: Union[List, None] = None,
         overlay_ids: bool = False,
         ids_to_keep: Union[List, Tuple, np.ndarray, None] = None,
@@ -704,10 +705,10 @@ class NetworkPlotter:
             arrow_base_shrink (float, optional): Distance between the text and the base of the arrow. Defaults to 0.0.
             arrow_tip_shrink (float, optional): Distance between the arrow tip and the centroid. Defaults to 0.0.
             max_labels (int, optional): Maximum number of labels to plot. Defaults to None (no limit).
-            max_words (int, optional): Maximum number of words in a label. Defaults to 10.
-            min_words (int, optional): Minimum number of words required to display a label. Defaults to 1.
-            max_word_length (int, optional): Maximum number of characters in a word to display. Defaults to 20.
-            min_word_length (int, optional): Minimum number of characters in a word to display. Defaults to 1.
+            min_label_lines (int, optional): Minimum number of lines in a label. Defaults to 1.
+            max_label_lines (int, optional): Maximum number of lines in a label. Defaults to None (no limit).
+            min_chars_per_line (int, optional): Minimum number of characters in a line to display. Defaults to 1.
+            max_chars_per_line (int, optional): Maximum number of characters in a line to display. Defaults to None (no limit).
             words_to_omit (list, optional): List of words to omit from the labels. Defaults to None.
             overlay_ids (bool, optional): Whether to overlay domain IDs in the center of the centroids. Defaults to False.
             ids_to_keep (list, tuple, np.ndarray, or None, optional): IDs of domains that must be labeled. To discover domain IDs,
@@ -736,70 +737,77 @@ class NetworkPlotter:
             label_arrow_base_shrink=arrow_base_shrink,
             label_arrow_tip_shrink=arrow_tip_shrink,
             label_max_labels=max_labels,
-            label_max_words=max_words,
-            label_min_words=min_words,
-            label_max_word_length=max_word_length,
-            label_min_word_length=min_word_length,
+            label_min_label_lines=min_label_lines,
+            label_max_label_lines=max_label_lines,
+            label_max_chars_per_line=max_chars_per_line,
+            label_min_chars_per_line=min_chars_per_line,
             label_words_to_omit=words_to_omit,
             label_overlay_ids=overlay_ids,
             label_ids_to_keep=ids_to_keep,
             label_ids_to_replace=ids_to_replace,
         )
 
+        # Convert ids_to_keep to a tuple if it is not None
+        ids_to_keep = tuple(ids_to_keep) if ids_to_keep else tuple()
         # Set max_labels to the total number of domains if not provided (None)
         if max_labels is None:
             max_labels = len(self.graph.domain_id_to_node_ids_map)
+        # Set max_label_lines and max_chars_per_line to large numbers if not provided (None)
+        if max_label_lines is None:
+            max_label_lines = int(1e6)
+        if max_chars_per_line is None:
+            max_chars_per_line = int(1e6)
         # Normalize words_to_omit to lowercase
         if words_to_omit:
             words_to_omit = set(word.lower() for word in words_to_omit)
 
-        # Calculate the center and radius of the network
-        domain_centroids = {}
+        # Calculate the center and radius of domains to position labels around the network
+        domain_id_to_centroid_map = {}
         for domain_id, node_ids in self.graph.domain_id_to_node_ids_map.items():
             if node_ids:  # Skip if the domain has no nodes
-                domain_centroids[domain_id] = self._calculate_domain_centroid(node_ids)
+                domain_id_to_centroid_map[domain_id] = self._calculate_domain_centroid(node_ids)
 
         # Initialize dictionaries and lists for valid indices
-        valid_indices = []
-        filtered_domain_centroids = {}
-        filtered_domain_terms = {}
+        valid_indices = []  # List of valid indices to plot colors and arrows
+        filtered_domain_centroids = {}  # Filtered domain centroids to plot
+        filtered_domain_terms = {}  # Filtered domain terms to plot
         # Handle the ids_to_keep logic
         if ids_to_keep:
             # Process the ids_to_keep first INPLACE
             self._process_ids_to_keep(
-                ids_to_keep,
-                max_labels,
-                domain_centroids,
-                ids_to_replace,
-                words_to_omit,
-                min_word_length,
-                max_word_length,
-                max_words,
-                min_words,
-                filtered_domain_centroids,
-                filtered_domain_terms,
-                valid_indices,
+                domain_id_to_centroid_map=domain_id_to_centroid_map,
+                ids_to_keep=ids_to_keep,
+                ids_to_replace=ids_to_replace,
+                words_to_omit=words_to_omit,
+                max_labels=max_labels,
+                min_label_lines=min_label_lines,
+                max_label_lines=max_label_lines,
+                min_chars_per_line=min_chars_per_line,
+                max_chars_per_line=max_chars_per_line,
+                filtered_domain_centroids=filtered_domain_centroids,
+                filtered_domain_terms=filtered_domain_terms,
+                valid_indices=valid_indices,
             )
 
         # Calculate remaining labels to plot after processing ids_to_keep
         remaining_labels = (
-            max_labels - len(ids_to_keep) if ids_to_keep and max_labels else max_labels
+            max_labels - len(valid_indices) if valid_indices and max_labels else max_labels
         )
         # Process remaining domains INPLACE to fill in additional labels, if there are slots left
         if remaining_labels and remaining_labels > 0:
             self._process_remaining_domains(
-                domain_centroids,
-                ids_to_keep,
-                ids_to_replace,
-                words_to_omit,
-                min_word_length,
-                max_word_length,
-                max_words,
-                min_words,
-                max_labels,
-                filtered_domain_centroids,
-                filtered_domain_terms,
-                valid_indices,
+                domain_id_to_centroid_map=domain_id_to_centroid_map,
+                ids_to_keep=ids_to_keep,
+                ids_to_replace=ids_to_replace,
+                words_to_omit=words_to_omit,
+                remaining_labels=remaining_labels,
+                min_chars_per_line=min_chars_per_line,
+                max_chars_per_line=max_chars_per_line,
+                max_label_lines=max_label_lines,
+                min_label_lines=min_label_lines,
+                filtered_domain_centroids=filtered_domain_centroids,
+                filtered_domain_terms=filtered_domain_terms,
+                valid_indices=valid_indices,
             )
 
         # Calculate the bounding box around the network
@@ -819,8 +827,8 @@ class NetworkPlotter:
         # Annotate the network with labels
         for idx, (domain, pos) in zip(valid_indices, best_label_positions.items()):
             centroid = filtered_domain_centroids[domain]
-            # Split by special key to split annotation into multiple lines
-            annotations = filtered_domain_terms[domain].split("::::")
+            # Split by special key TERM_DELIMITER to split annotation into multiple lines
+            annotations = filtered_domain_terms[domain].split(TERM_DELIMITER)
             self.ax.annotate(
                 "\n".join(annotations),
                 xy=centroid,
@@ -969,15 +977,15 @@ class NetworkPlotter:
 
     def _process_ids_to_keep(
         self,
-        ids_to_keep: Union[List[str], Tuple[str], np.ndarray, None],
-        max_labels: Union[int, None],
-        domain_centroids: Dict[str, np.ndarray],
+        domain_id_to_centroid_map: Dict[str, np.ndarray],
+        ids_to_keep: Union[List[str], Tuple[str], np.ndarray],
         ids_to_replace: Union[Dict[str, str], None],
         words_to_omit: Union[List[str], None],
-        min_word_length: int,
-        max_word_length: int,
-        max_words: int,
-        min_words: int,
+        max_labels: Union[int, None],
+        min_label_lines: int,
+        max_label_lines: int,
+        min_chars_per_line: int,
+        max_chars_per_line: int,
         filtered_domain_centroids: Dict[str, np.ndarray],
         filtered_domain_terms: Dict[str, str],
         valid_indices: List[int],
@@ -985,15 +993,15 @@ class NetworkPlotter:
         """Process the ids_to_keep, apply filtering, and store valid domain centroids and terms.
 
         Args:
-            ids_to_keep (list, tuple, np.ndarray, or None, optional): IDs of domains that must be labeled.
-            max_labels (int, optional): Maximum number of labels allowed.
-            domain_centroids (dict): Mapping of domains to their centroids.
+            domain_id_to_centroid_map (dict): Mapping of domain IDs to their centroids.
+            ids_to_keep (list, tuple, or np.ndarray, optional): IDs of domains that must be labeled.
             ids_to_replace (dict, optional): A dictionary mapping domain IDs to custom labels. Defaults to None.
             words_to_omit (list, optional): List of words to omit from the labels. Defaults to None.
-            min_word_length (int): Minimum allowed word length.
-            max_word_length (int): Maximum allowed word length.
-            max_words (int): Maximum number of words allowed.
-            min_words (int): Minimum number of words required for a domain.
+            max_labels (int, optional): Maximum number of labels allowed.
+            min_label_lines (int): Minimum number of lines in a label.
+            max_label_lines (int): Maximum number of lines in a label.
+            min_chars_per_line (int): Minimum number of characters in a line to display.
+            max_chars_per_line (int): Maximum number of characters in a line to display.
             filtered_domain_centroids (dict): Dictionary to store filtered domain centroids (output).
             filtered_domain_terms (dict): Dictionary to store filtered domain terms (output).
             valid_indices (list): List to store valid indices (output).
@@ -1004,8 +1012,6 @@ class NetworkPlotter:
         Raises:
             ValueError: If the number of provided `ids_to_keep` exceeds `max_labels`.
         """
-        # Convert ids_to_keep to a set for faster, unique lookups
-        ids_to_keep = set(ids_to_keep) if ids_to_keep else set()
         # Check if the number of provided ids_to_keep exceeds max_labels
         if max_labels is not None and len(ids_to_keep) > max_labels:
             raise ValueError(
@@ -1014,45 +1020,54 @@ class NetworkPlotter:
 
         # Process each domain in ids_to_keep
         for domain in ids_to_keep:
-            if domain in self.graph.domain_id_to_domain_terms_map and domain in domain_centroids:
-                filtered_domain_terms[domain] = self._process_terms(
+            if (
+                domain in self.graph.domain_id_to_domain_terms_map
+                and domain in domain_id_to_centroid_map
+            ):
+                domain_centroid = domain_id_to_centroid_map[domain]
+                # No need to filter the domain terms if it is in ids_to_keep
+                _ = self._validate_and_update_domain(
                     domain=domain,
+                    domain_centroid=domain_centroid,
+                    domain_id_to_centroid_map=domain_id_to_centroid_map,
                     ids_to_replace=ids_to_replace,
                     words_to_omit=words_to_omit,
-                    min_word_length=min_word_length,
-                    max_word_length=max_word_length,
-                    max_words=max_words,
+                    min_label_lines=min_label_lines,
+                    max_label_lines=max_label_lines,
+                    min_chars_per_line=min_chars_per_line,
+                    max_chars_per_line=max_chars_per_line,
+                    filtered_domain_centroids=filtered_domain_centroids,
+                    filtered_domain_terms=filtered_domain_terms,
+                    valid_indices=valid_indices,
                 )
-                filtered_domain_centroids[domain] = domain_centroids[domain]
-                valid_indices.append(list(domain_centroids.keys()).index(domain))
 
     def _process_remaining_domains(
         self,
-        domain_centroids: Dict[str, np.ndarray],
-        ids_to_keep: Union[List[str], Tuple[str], np.ndarray, None],
+        domain_id_to_centroid_map: Dict[str, np.ndarray],
+        ids_to_keep: Union[List[str], Tuple[str], np.ndarray],
         ids_to_replace: Union[Dict[str, str], None],
         words_to_omit: Union[List[str], None],
-        min_word_length: int,
-        max_word_length: int,
-        max_words: int,
-        min_words: int,
-        max_labels: Union[int, None],
+        remaining_labels: int,
+        min_label_lines: int,
+        max_label_lines: int,
+        min_chars_per_line: int,
+        max_chars_per_line: int,
         filtered_domain_centroids: Dict[str, np.ndarray],
         filtered_domain_terms: Dict[str, str],
         valid_indices: List[int],
     ) -> None:
-        """Process remaining domains to fill in additional labels, if there are slots left.
+        """Process remaining domains to fill in additional labels, respecting the remaining_labels limit.
 
         Args:
-            domain_centroids (dict): Mapping of domains to their centroids.
-            ids_to_keep (list, tuple, np.ndarray, or None, optional): IDs of domains that must be labeled. Defaults to None.
+            domain_id_to_centroid_map (dict): Mapping of domain IDs to their centroids.
+            ids_to_keep (list, tuple, or np.ndarray, optional): IDs of domains that must be labeled.
             ids_to_replace (dict, optional): A dictionary mapping domain IDs to custom labels. Defaults to None.
             words_to_omit (list, optional): List of words to omit from the labels. Defaults to None.
-            min_word_length (int): Minimum allowed word length.
-            max_word_length (int): Maximum allowed word length.
-            max_words (int): Maximum number of words allowed.
-            min_words (int): Minimum number of words required for a domain.
-            max_labels (int, optional): Maximum number of labels allowed. Defaults to None.
+            remaining_labels (int): The remaining number of labels that can be generated.
+            min_label_lines (int): Minimum number of lines in a label.
+            max_label_lines (int): Maximum number of lines in a label.
+            min_chars_per_line (int): Minimum number of characters in a line to display.
+            max_chars_per_line (int): Maximum number of characters in a line to display.
             filtered_domain_centroids (dict): Dictionary to store filtered domain centroids (output).
             filtered_domain_terms (dict): Dictionary to store filtered domain terms (output).
             valid_indices (list): List to store valid indices (output).
@@ -1060,32 +1075,142 @@ class NetworkPlotter:
         Note:
             The `filtered_domain_centroids`, `filtered_domain_terms`, and `valid_indices` are modified in-place.
         """
-        for idx, (domain, centroid) in enumerate(domain_centroids.items()):
-            # Check if the domain is NaN and continue if true
-            if pd.isna(domain) or (isinstance(domain, float) and np.isnan(domain)):
-                continue  # Skip NaN domains
-            if ids_to_keep and domain in ids_to_keep:
-                continue  # Skip domains already handled by ids_to_keep
-
-            filtered_domain_terms[domain] = self._process_terms(
+        # Counter to track how many labels have been created
+        label_count = 0
+        # Collect domains not in ids_to_keep
+        remaining_domains = {
+            domain: centroid
+            for domain, centroid in domain_id_to_centroid_map.items()
+            if domain not in ids_to_keep and not pd.isna(domain)
+        }
+
+        # Function to calculate distance between two centroids
+        def calculate_distance(centroid1, centroid2):
+            return np.linalg.norm(centroid1 - centroid2)
+
+        # Find the farthest apart domains using centroids
+        if remaining_domains and remaining_labels:
+            selected_domains = []
+            first_domain = next(iter(remaining_domains))  # Pick the first domain to start
+            selected_domains.append(first_domain)
+
+            while len(selected_domains) < remaining_labels:
+                farthest_domain = None
+                max_distance = -1
+                # Find the domain farthest from any already selected domain
+                for candidate_domain, candidate_centroid in remaining_domains.items():
+                    if candidate_domain in selected_domains:
+                        continue
+
+                    # Calculate the minimum distance to any selected domain
+                    min_distance = min(
+                        calculate_distance(candidate_centroid, remaining_domains[dom])
+                        for dom in selected_domains
+                    )
+                    # Update the farthest domain if the minimum distance is greater
+                    if min_distance > max_distance:
+                        max_distance = min_distance
+                        farthest_domain = candidate_domain
+
+                # Add the farthest domain to the selected domains
+                if farthest_domain:
+                    selected_domains.append(farthest_domain)
+                else:
+                    break  # No more domains to select
+
+        # Process the selected domains and add to filtered lists
+        for domain in selected_domains:
+            domain_centroid = remaining_domains[domain]
+            is_domain_valid = self._validate_and_update_domain(
                 domain=domain,
+                domain_centroid=domain_centroid,
+                domain_id_to_centroid_map=domain_id_to_centroid_map,
                 ids_to_replace=ids_to_replace,
                 words_to_omit=words_to_omit,
-                min_word_length=min_word_length,
-                max_word_length=max_word_length,
-                max_words=max_words,
+                min_label_lines=min_label_lines,
+                max_label_lines=max_label_lines,
+                min_chars_per_line=min_chars_per_line,
+                max_chars_per_line=max_chars_per_line,
+                filtered_domain_centroids=filtered_domain_centroids,
+                filtered_domain_terms=filtered_domain_terms,
+                valid_indices=valid_indices,
             )
-            filtered_domain_centroids[domain] = centroid
-            valid_indices.append(idx)
+            # Increment the label count if the domain is valid
+            if is_domain_valid:
+                label_count += 1
+                if label_count >= remaining_labels:
+                    break
+
+    def _validate_and_update_domain(
+        self,
+        domain: str,
+        domain_centroid: np.ndarray,
+        domain_id_to_centroid_map: Dict[str, np.ndarray],
+        ids_to_replace: Union[Dict[str, str], None],
+        words_to_omit: Union[List[str], None],
+        min_label_lines: int,
+        max_label_lines: int,
+        min_chars_per_line: int,
+        max_chars_per_line: int,
+        filtered_domain_centroids: Dict[str, np.ndarray],
+        filtered_domain_terms: Dict[str, str],
+        valid_indices: List[int],
+    ) -> bool:
+        """Validate and process the domain terms, updating relevant dictionaries if valid.
+
+        Args:
+            domain (str): Domain ID to process.
+            domain_centroid (np.ndarray): Centroid position of the domain.
+            domain_id_to_centroid_map (dict): Mapping of domain IDs to their centroids.
+            ids_to_replace (Union[Dict[str, str], None]): A dictionary mapping domain IDs to custom labels.
+            words_to_omit (Union[List[str], None]): List of words to omit from the labels.
+            min_label_lines (int): Minimum number of lines required in a label.
+            max_label_lines (int): Maximum number of lines allowed in a label.
+            min_chars_per_line (int): Minimum number of characters allowed per line.
+            max_chars_per_line (int): Maximum number of characters allowed per line.
+            filtered_domain_centroids (Dict[str, np.ndarray]): Dictionary to store valid domain centroids.
+            filtered_domain_terms (Dict[str, str]): Dictionary to store valid domain terms.
+            valid_indices (List[int]): List of valid domain indices.
+
+        Returns:
+            bool: True if the domain is valid and added to the filtered dictionaries, False otherwise.
+
+        Note:
+            The `filtered_domain_centroids`, `filtered_domain_terms`, and `valid_indices` are modified in-place.
+        """
+        # Process the domain terms
+        domain_terms = self._process_terms(
+            domain=domain,
+            ids_to_replace=ids_to_replace,
+            words_to_omit=words_to_omit,
+            max_label_lines=max_label_lines,
+            min_chars_per_line=min_chars_per_line,
+            max_chars_per_line=max_chars_per_line,
+        )
+        # If domain_terms is empty, skip further processing
+        if not domain_terms:
+            return False
+
+        # Split the terms by TERM_DELIMITER and count the number of lines
+        num_domain_lines = len(domain_terms.split(TERM_DELIMITER))
+        # Check if the number of lines is greater than or equal to the minimum
+        if num_domain_lines >= min_label_lines:
+            filtered_domain_centroids[domain] = domain_centroid
+            filtered_domain_terms[domain] = domain_terms
+            # Add the index of the domain to the valid indices list
+            valid_indices.append(list(domain_id_to_centroid_map.keys()).index(domain))
+            return True
+
+        return False
 
     def _process_terms(
         self,
         domain: str,
         ids_to_replace: Union[Dict[str, str], None],
         words_to_omit: Union[List[str], None],
-        min_word_length: int,
-        max_word_length: int,
-        max_words: int,
+        max_label_lines: int,
+        min_chars_per_line: int,
+        max_chars_per_line: int,
     ) -> List[str]:
         """Process terms for a domain, applying word length constraints and combining words where appropriate.
 
@@ -1093,12 +1218,12 @@ class NetworkPlotter:
             domain (str): The domain being processed.
             ids_to_replace (dict, optional): Dictionary mapping domain IDs to custom labels.
             words_to_omit (list, optional): List of words to omit from the labels.
-            min_word_length (int): Minimum allowed word length.
-            max_word_length (int): Maximum allowed word length.
-            max_words (int): Maximum number of words allowed.
+            max_label_lines (int): Maximum number of lines in a label.
+            min_chars_per_line (int): Minimum number of characters in a line to display.
+            max_chars_per_line (int): Maximum number of characters in a line to display.
 
         Returns:
-            list: Processed terms, with words combined if necessary to fit within constraints.
+            str: Processed terms separated by TERM_DELIMITER, with words combined if necessary to fit within constraints.
         """
         # Handle ids_to_replace logic
         if ids_to_replace and domain in ids_to_replace:
@@ -1111,11 +1236,11 @@ class NetworkPlotter:
             terms = [
                 term
                 for term in terms
-                if term.lower() not in words_to_omit and len(term) >= min_word_length
+                if term.lower() not in words_to_omit and len(term) >= min_chars_per_line
             ]
 
         # Use the combine_words function directly to handle word combinations and length constraints
-        compressed_terms = _combine_words(tuple(terms), max_word_length, max_words)
+        compressed_terms = _combine_words(tuple(terms), max_chars_per_line, max_label_lines)
 
         return compressed_terms
 
@@ -1433,14 +1558,14 @@ def _calculate_bounding_box(
     return center, radius
 
 
-def _combine_words(words: List[str], max_length: int, max_words: int) -> str:
-    """Combine words to fit within the max_length and max_words constraints,
-    and separate the final output by ':' for plotting.
+def _combine_words(words: List[str], max_chars_per_line: int, max_label_lines: int) -> str:
+    """Combine words to fit within the max_chars_per_line and max_label_lines constraints,
+    and separate the final output by TERM_DELIMITER for plotting.
 
     Args:
         words (List[str]): List of words to combine.
-        max_length (int): Maximum allowed length for a combined line.
-        max_words (int): Maximum number of lines (words) allowed.
+        max_chars_per_line (int): Maximum number of characters in a line to display.
+        max_label_lines (int): Maximum number of lines in a label.
 
     Returns:
         str: String of combined words separated by ':' for line breaks.
@@ -1456,34 +1581,38 @@ def _combine_words(words: List[str], max_length: int, max_words: int) -> str:
             # Try to combine more words if possible, and ensure the combination fits within max_length
             for j in range(i + 1, len(words_batch)):
                 next_word = words_batch[j]
-                if len(combined_word) + len(next_word) + 2 <= max_length:  # +2 for ', '
+                # Ensure that the combined word fits within the max_chars_per_line limit
+                if len(combined_word) + len(next_word) + 1 <= max_chars_per_line:  # +1 for space
                     combined_word = f"{combined_word} {next_word}"
                     i += 1  # Move past the combined word
                 else:
                     break  # Stop combining if the length is exceeded
 
-            combined_lines.append(combined_word)  # Add the combined word or single word
-            i += 1  # Move to the next word
+            # Add the combined word only if it fits within the max_chars_per_line limit
+            if len(combined_word) <= max_chars_per_line:
+                combined_lines.append(combined_word)  # Add the combined word
+            # Move to the next word
+            i += 1
 
-            # Stop if we've reached the max_words limit
-            if len(combined_lines) >= max_words:
+            # Stop if we've reached the max_label_lines limit
+            if len(combined_lines) >= max_label_lines:
                 break
 
         return combined_lines
 
-    # Main logic: start with max_words number of words
-    combined_lines = try_combinations(words[:max_words])
-    remaining_words = words[max_words:]  # Remaining words after the initial batch
+    # Main logic: start with max_label_lines number of words
+    combined_lines = try_combinations(words[:max_label_lines])
+    remaining_words = words[max_label_lines:]  # Remaining words after the initial batch
 
     # Continue pulling more words until we fill the lines
-    while remaining_words and len(combined_lines) < max_words:
-        available_slots = max_words - len(combined_lines)
+    while remaining_words and len(combined_lines) < max_label_lines:
+        available_slots = max_label_lines - len(combined_lines)
         words_to_add = remaining_words[:available_slots]
         remaining_words = remaining_words[available_slots:]
         combined_lines += try_combinations(words_to_add)
 
-    # Join the final combined lines with '::::', a special separator for line breaks
-    return "::::".join(combined_lines[:max_words])
+    # Join the final combined lines with TERM_DELIMITER, a special separator for line breaks
+    return TERM_DELIMITER.join(combined_lines[:max_label_lines])
 
 
 def _calculate_best_label_positions(

{risk_network-0.0.8b2 → risk_network-0.0.8b4}/risk_network.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: risk-network
-Version: 0.0.8b2
+Version: 0.0.8b4
 Summary: A Python package for biological network analysis
 Author: Ira Horecka
 Author-email: Ira Horecka <ira89@icloud.com>