Merge pull request #96 from konbraphat51/dev

Version Update: 1.0.9

Author: konbraphat51

AnimatedWordCloud/Animator/AllocationCalculator/AnimatetdAllocationCalculator.py

@@ -43,9 +43,7 @@ def animated_allocate(
         time_name_to = allocation_timelapse.timelapse[index + 1][0]
 
         # interpolate between two frames
-        interpolated_frames: list[
-            AllocationInFrame
-        ] = _get_interpolated_frames(
+        interpolated_frames = _get_interpolated_frames(
             from_allocation_frame,
             to_allocation_frame,
             config,

AnimatedWordCloud/Animator/AllocationCalculator/StaticAllocationCalculator/StaticAllocationStrategies/MagneticAllocation/MagneticAllocation.py

@@ -17,7 +17,6 @@
 import math
 from typing import Iterable
 from tqdm import tqdm
-import joblib
 from AnimatedWordCloud.Utils import (
     is_rect_hitting_rects,
     AllocationInFrame,
@@ -230,15 +229,9 @@ def _find_best_position(
         ]
 
         # get center position candidates
-        results_by_sides = joblib.Parallel(n_jobs=-1, verbose=0)(
-            joblib.delayed(self._get_candidates_from_one_side)(
-                pivots_to_center_list[cnt], frontier_sides[cnt]
-            )
-            for cnt in range(4)
+        center_position_candidates = self._compute_candidates(
+            pivots_to_center_list, frontier_sides
         )
-        center_position_candidates = []
-        for results_by_side in results_by_sides:
-            center_position_candidates.extend(results_by_side)
 
         # error handling: too small image area that cannot put the word anywhere anymore
         if len(center_position_candidates) == 0:
@@ -259,6 +252,31 @@ def _find_best_position(
 
         return best_position_left_top
 
+    def _compute_candidates(
+        self,
+        pivots_to_center_list: Iterable[Iterable[Vector]],
+        frontier_sides: Iterable[Iterable[Vector]],
+    ) -> list[tuple[int, int]]:
+        """
+        Compute all candidates of the center position
+
+        :param Iterable[Iterable[Vector]] pivots_to_center_list:
+            List of vectors from the pivot to the center of the word
+        :param Iterable[Iterable[Vector]]
+            List of vectors from the frontier to the center of the word
+        :return: Candidates of the center position
+        """
+
+        center_position_candidates = []
+        for cnt in range(4):
+            center_position_candidates.extend(
+                self._get_candidates_from_one_side(
+                    pivots_to_center_list[cnt], frontier_sides[cnt]
+                )
+            )
+
+        return center_position_candidates
+
     def _get_candidates_from_one_side(
         self,
         pivots_to_center: Iterable[Vector],
@@ -303,12 +321,10 @@ def _try_put_all_candidates(
         :rtype: tuple[int, int]
         """
 
-        results_evaluation = joblib.Parallel(n_jobs=-1, verbose=0)(
-            joblib.delayed(self._try_put_position)(
-                center_position, size, position_from
-            )
+        results_evaluation = [
+            self._try_put_position(center_position, size, position_from)
             for center_position in center_positions
-        )
+        ]
 
         # find best score
         best_position = None

README.md

@@ -1,6 +1,4 @@
-# AnimatedWordCloud ver 1.0.8
-
-**UNDER CONSTRUCTION**
+# AnimatedWordCloud ver 1.0.9
 
 <a href="https://codeclimate.com/github/konbraphat51/AnimatedWordCloud/maintainability"><img src="https://api.codeclimate.com/v1/badges/7a03252f77e7af46dc0f/maintainability" /></a>
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/20a71da0d9d841a2af236f6362a08ae7)](https://app.codacy.com/gh/konbraphat51/AnimatedWordCloud/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)

setup.py

@@ -19,7 +19,7 @@ def requirements_from_file(file_name):
 
 setup(
     name="AnimatedWordCloudTimelapse",
-    version="1.0.8",
+    version="1.0.9",
     description="Animate a timelapse of word cloud",
     long_description=readme,
     long_description_content_type="text/markdown",
@@ -32,7 +32,7 @@ def requirements_from_file(file_name):
     package_data={"AnimatedWordCloud": ["Assets/**"]},
     include_package_data=True,
     install_requires=[
-        "Pillow==10.1.0",
+        "Pillow==10.3.0",
         "numpy",
         "matplotlib",
         "joblib",