Merge pull request #7 from factryflow/bugfix/matrix-utilization

Bugfix/matrix utilization

.gitignore

@@ -1,5 +1,9 @@
 # Prototyping Notebooks
 notebooks/
+*.ipynb
+
+# Test data
+inputs/
 
 # vscode settings
 .vscode/

src/factryengine/models/task.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Field, model_validator, validator
+from pydantic import BaseModel, Field, model_validator, validator, PrivateAttr
 
 from .resource import Resource, ResourceGroup
 
@@ -44,15 +44,16 @@ def get_unique_resources(self) -> set[Resource]:
 
 
 class Task(BaseModel):
-    id: int
+    id: int | str
     name: str = ""
     duration: int = Field(gt=0)
     priority: int = Field(gt=0)
     assignments: list[Assignment] = []
     constraints: set[Resource] = set()
-    predecessor_ids: set[int] = set()
+    predecessor_ids: set[int] | set[str] = set()
     predecessor_delay: int = Field(0, gt=0)
     quantity: int = Field(None, gt=0)
+    _batch_id: int = PrivateAttr(None)
 
     def __hash__(self):
         return hash(self.id)
@@ -85,3 +86,12 @@ def set_name(cls, v, values) -> str:
     def get_id(self) -> int:
         """returns the task id"""
         return self.id
+
+    @property
+    def batch_id(self):
+        """returns the batch id of the task"""
+        return self._batch_id
+
+    def set_batch_id(self, batch_id):
+        """sets the batch id of the task"""
+        self._batch_id = batch_id

src/factryengine/scheduler/heuristic_solver/main.py

@@ -74,24 +74,25 @@ def solve(self) -> list[dict]:
             except AllocationError as e:
                 self.mark_task_as_unscheduled(task_id=task_id, error_message=str(e))
                 continue
-
+        
             # update resource windows
             self.window_manager.update_resource_windows(allocated_resource_windows_dict)
 
-            # Append task values
+
             task_values = {
                 "task_id": task_id,
                 "assigned_resource_ids": list(allocated_resource_windows_dict.keys()),
                 "task_start": min(
-                    start for start, _ in allocated_resource_windows_dict.values()
+                    start for intervals in allocated_resource_windows_dict.values() for start, _ in intervals
                 ),
                 "task_end": max(
-                    end for _, end in allocated_resource_windows_dict.values()
+                    end for intervals in allocated_resource_windows_dict.values() for _, end in intervals
                 ),
                 "resource_intervals": allocated_resource_windows_dict.values(),
             }
             self.task_vars[task_id] = task_values
 
+
         return list(
             self.task_vars.values()
         )  # Return values of the dictionary as a list

src/factryengine/scheduler/heuristic_solver/matrix.py

@@ -56,9 +56,12 @@ def trim_end(cls, original_matrix: "Matrix", trim_matrix: "Matrix") -> "Matrix":
         Trims a Matrix based on another
         """
         new_intervals = original_matrix.intervals[: len(trim_matrix.intervals)]
-        # Check if intervals are the same
 
-        if not np.array_equal(new_intervals, trim_matrix.intervals):
+        # if not np.array_equal(new_intervals, trim_matrix.intervals):
+        #     raise ValueError("All matrices must have the same intervals")
+
+        # Used np.allclose to allow for small differences in the intervals
+        if not np.allclose(new_intervals, trim_matrix.intervals, atol=1e-8):
             raise ValueError("All matrices must have the same intervals")
 
         return cls(