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

Bugfix/matrix utilization
factryflow · Oct 25, 2024 · 6dac9c2 · 6dac9c2
2 parents 7460a35 + 415068c
commit 6dac9c2
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/docs/example.ipynb b/docs/example.ipynb
@@ -11,7 +11,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 3,
+      "execution_count": 1,
       "metadata": {},
       "outputs": [
         {
@@ -44,7 +44,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 4,
+      "execution_count": 2,
       "metadata": {},
       "outputs": [
         {
@@ -82,27 +82,27 @@
               "      <td>[1]</td>\n",
               "      <td>5</td>\n",
               "      <td>10</td>\n",
-              "      <td>((5, 10))</td>\n",
+              "      <td>([(5, 10)])</td>\n",
               "    </tr>\n",
               "    <tr>\n",
               "      <th>1</th>\n",
               "      <td>2</td>\n",
               "      <td>[1]</td>\n",
               "      <td>0</td>\n",
               "      <td>5</td>\n",
-              "      <td>((0, 5))</td>\n",
+              "      <td>([(0, 5)])</td>\n",
               "    </tr>\n",
               "  </tbody>\n",
               "</table>\n",
               "</div>"
             ],
             "text/plain": [
               "   task_id assigned_resource_ids  task_start  task_end resource_intervals\n",
-              "0        1                   [1]           5        10          ((5, 10))\n",
-              "1        2                   [1]           0         5           ((0, 5))"
+              "0        1                   [1]           5        10        ([(5, 10)])\n",
+              "1        2                   [1]           0         5         ([(0, 5)])"
             ]
           },
-          "execution_count": 4,
+          "execution_count": 2,
           "metadata": {},
           "output_type": "execute_result"
         }
@@ -128,7 +128,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 5,
+      "execution_count": 3,
       "metadata": {},
       "outputs": [
         {
@@ -173,18 +173,18 @@
               "      <td>[3, 4]</td>\n",
               "      <td>0</td>\n",
               "      <td>3</td>\n",
-              "      <td>((0, 3), (0, 3))</td>\n",
+              "      <td>([(0, 3)], [(0, 3)])</td>\n",
               "    </tr>\n",
               "  </tbody>\n",
               "</table>\n",
               "</div>"
             ],
             "text/plain": [
-              "   task_id assigned_resource_ids  task_start  task_end resource_intervals\n",
-              "0        1                [3, 4]           0         3   ((0, 3), (0, 3))"
+              "   task_id assigned_resource_ids  task_start  task_end    resource_intervals\n",
+              "0        1                [3, 4]           0         3  ([(0, 3)], [(0, 3)])"
             ]
           },
-          "execution_count": 5,
+          "execution_count": 3,
           "metadata": {},
           "output_type": "execute_result"
         }
@@ -227,7 +227,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 6,
+      "execution_count": 4,
       "metadata": {},
       "outputs": [
         {
@@ -272,18 +272,21 @@
               "      <td>[4, 1]</td>\n",
               "      <td>20</td>\n",
               "      <td>30</td>\n",
-              "      <td>((20, 30), (20, 30))</td>\n",
+              "      <td>([(20, 30)], [(20, 30)])</td>\n",
               "    </tr>\n",
               "  </tbody>\n",
               "</table>\n",
               "</div>"
             ],
             "text/plain": [
-              "   task_id assigned_resource_ids  task_start  task_end    resource_intervals\n",
-              "0        1                [4, 1]          20        30  ((20, 30), (20, 30))"
+              "   task_id assigned_resource_ids  task_start  task_end  \\\n",
+              "0        1                [4, 1]          20        30   \n",
+              "\n",
+              "         resource_intervals  \n",
+              "0  ([(20, 30)], [(20, 30)])  "
             ]
           },
-          "execution_count": 6,
+          "execution_count": 4,
           "metadata": {},
           "output_type": "execute_result"
         }
@@ -320,7 +323,7 @@
   ],
   "metadata": {
     "kernelspec": {
-      "display_name": "base",
+      "display_name": ".venv",
       "language": "python",
       "name": "python3"
     },
@@ -334,7 +337,7 @@
       "name": "python",
       "nbconvert_exporter": "python",
       "pygments_lexer": "ipython3",
-      "version": "3.11.6"
+      "version": "3.11.4"
     },
     "orig_nbformat": 4
   },