feat : update the genetic algorithm + new testcase

mikeleo03 · mikeleo03 · commit c3c6cd067a85 · 2023-06-05T21:14:33.000+07:00
diff --git a/src/Genetic_Algorithm.py b/src/Genetic_Algorithm.py
@@ -142,7 +142,7 @@ def do_genetic_algo(count):
             
             # Jika ternyata lebih efektif di mesin lain, switch ke mesin tersebut
             if (MESIN[0][ST[i][2] - 1] > minimum):
-                ST[job-1] = [job, ST[job-1][1], idx_mesin + 1]      # Ubah nilai ST
+                ST[i] = [job, ST[i][1], idx_mesin + 1]      # Ubah nilai ST
                 hinggap = idx_mesin + 1                             # Inisiasi nilai pembanding
                 temp_list.append(ST[i])                             # Masukkan dalam senarai solusi
             # Jika ternyata tidak, maka 
@@ -175,10 +175,7 @@ def do_genetic_algo(count):
                 nums1 = CJ[i]
                 nums2 = MESIN[0][hinggap - 1]
                 MESIN[0][ST[i][2] - 1] += PROCESSING_TIME[job - 1][ST[i][1] - 1]
-                if nums1 < nums2:
-                    COPY_OF_CJ[i] = nums1
-                else :
-                    COPY_OF_CJ[i] = nums2
+                COPY_OF_CJ[i] = nums2
         
         # Mesin 5-6 adalah mesin yang sama
         # Maka dapat menerapkan skema yang sama seperti mesin 1-4 diatas    
@@ -216,10 +213,7 @@ def do_genetic_algo(count):
                 nums1 = CJ[i]
                 nums2 = MESIN[0][hinggap - 1]
                 MESIN[0][ST[i][2] - 1] += PROCESSING_TIME[job - 1][ST[i][1] - 1]
-                if nums1 < nums2:
-                    COPY_OF_CJ[i] = nums1
-                else :
-                    COPY_OF_CJ[i] = nums2
+                COPY_OF_CJ[i] = nums2
         
         # Karena mesin 7 berbeda sendiri, lakukan pemrosesan secara normal
         else :                
diff --git a/test4/Job10_Routing.txt b/test4/Job10_Routing.txt
@@ -0,0 +1 @@
+3, 3 
diff --git a/test4/Job10_Time.txt b/test4/Job10_Time.txt
@@ -0,0 +1 @@
+7.5, 5.7
diff --git a/test4/Job11_Routing.txt b/test4/Job11_Routing.txt
@@ -0,0 +1 @@
+3
diff --git a/test4/Job11_Time.txt b/test4/Job11_Time.txt
@@ -0,0 +1 @@
+6.4
diff --git a/test4/Job12_Routing.txt b/test4/Job12_Routing.txt
@@ -0,0 +1 @@
+3, 3
diff --git a/test4/Job12_Time.txt b/test4/Job12_Time.txt
@@ -0,0 +1 @@
+6.5, 2.3
diff --git a/test4/Job13_Routing.txt b/test4/Job13_Routing.txt
@@ -0,0 +1 @@
+4, 4
diff --git a/test4/Job13_Time.txt b/test4/Job13_Time.txt
@@ -0,0 +1 @@
+3.9, 4
diff --git a/test4/Job14_Routing.txt b/test4/Job14_Routing.txt
@@ -0,0 +1 @@
+4
diff --git a/test4/Job14_Time.txt b/test4/Job14_Time.txt
@@ -0,0 +1 @@
+7
diff --git a/test4/Job15_Routing.txt b/test4/Job15_Routing.txt
@@ -0,0 +1 @@
+4
diff --git a/test4/Job15_Time.txt b/test4/Job15_Time.txt
@@ -0,0 +1 @@
+3
diff --git a/test4/Job16_Routing.txt b/test4/Job16_Routing.txt
@@ -0,0 +1 @@
+4
diff --git a/test4/Job16_Time.txt b/test4/Job16_Time.txt
@@ -0,0 +1 @@
+8.3
diff --git a/test4/Job17_Routing.txt b/test4/Job17_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job17_Time.txt b/test4/Job17_Time.txt
@@ -0,0 +1 @@
+1.8
diff --git a/test4/Job18_Routing.txt b/test4/Job18_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job18_Time.txt b/test4/Job18_Time.txt
@@ -0,0 +1 @@
+0.9
diff --git a/test4/Job19_Routing.txt b/test4/Job19_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job19_Time.txt b/test4/Job19_Time.txt
@@ -0,0 +1 @@
+1.4
diff --git a/test4/Job1_Routing.txt b/test4/Job1_Routing.txt
@@ -0,0 +1 @@
+1, 1
diff --git a/test4/Job1_Time.txt b/test4/Job1_Time.txt
@@ -0,0 +1 @@
+8.3, 8.3 
diff --git a/test4/Job20_Routing.txt b/test4/Job20_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job20_Time.txt b/test4/Job20_Time.txt
@@ -0,0 +1 @@
+3.3
diff --git a/test4/Job21_Routing.txt b/test4/Job21_Routing.txt
@@ -0,0 +1 @@
+5, 5 
diff --git a/test4/Job21_Time.txt b/test4/Job21_Time.txt
@@ -0,0 +1 @@
+3.9, 7.3
diff --git a/test4/Job22_Routing.txt b/test4/Job22_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job22_Time.txt b/test4/Job22_Time.txt
@@ -0,0 +1 @@
+6.2 
diff --git a/test4/Job23_Routing.txt b/test4/Job23_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job23_Time.txt b/test4/Job23_Time.txt
@@ -0,0 +1 @@
+1.1
diff --git a/test4/Job24_Routing.txt b/test4/Job24_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job24_Time.txt b/test4/Job24_Time.txt
@@ -0,0 +1 @@
+2.2
diff --git a/test4/Job25_Routing.txt b/test4/Job25_Routing.txt
@@ -0,0 +1 @@
+5, 5
diff --git a/test4/Job25_Time.txt b/test4/Job25_Time.txt
@@ -0,0 +1 @@
+6.7, 5.8
diff --git a/test4/Job26_Routing.txt b/test4/Job26_Routing.txt
@@ -0,0 +1 @@
+5
diff --git a/test4/Job26_Time.txt b/test4/Job26_Time.txt
@@ -0,0 +1 @@
+1.8
diff --git a/test4/Job27_Routing.txt b/test4/Job27_Routing.txt
@@ -0,0 +1 @@
+6
diff --git a/test4/Job27_Time.txt b/test4/Job27_Time.txt
@@ -0,0 +1 @@
+6.3
diff --git a/test4/Job28_Routing.txt b/test4/Job28_Routing.txt
@@ -0,0 +1 @@
+6, 6, 6
diff --git a/test4/Job28_Time.txt b/test4/Job28_Time.txt
@@ -0,0 +1 @@
+0.5, 1.4, 2.2 
diff --git a/test4/Job29_Routing.txt b/test4/Job29_Routing.txt
@@ -0,0 +1 @@
+6, 6
diff --git a/test4/Job29_Time.txt b/test4/Job29_Time.txt
@@ -0,0 +1 @@
+4.9, 0.5
diff --git a/test4/Job2_Routing.txt b/test4/Job2_Routing.txt
@@ -0,0 +1 @@
+1
diff --git a/test4/Job2_Time.txt b/test4/Job2_Time.txt
@@ -0,0 +1 @@
+6.5
diff --git a/test4/Job30_Routing.txt b/test4/Job30_Routing.txt
@@ -0,0 +1 @@
+6
diff --git a/test4/Job30_Time.txt b/test4/Job30_Time.txt
@@ -0,0 +1 @@
+1.8
diff --git a/test4/Job31_Routing.txt b/test4/Job31_Routing.txt
@@ -0,0 +1 @@
+6
diff --git a/test4/Job31_Time.txt b/test4/Job31_Time.txt
@@ -0,0 +1 @@
+4
diff --git a/test4/Job32_Routing.txt b/test4/Job32_Routing.txt
@@ -0,0 +1 @@
+6
diff --git a/test4/Job32_Time.txt b/test4/Job32_Time.txt
@@ -0,0 +1 @@
+0.7
diff --git a/test4/Job33_Routing.txt b/test4/Job33_Routing.txt
@@ -0,0 +1 @@
+6
diff --git a/test4/Job33_Time.txt b/test4/Job33_Time.txt
@@ -0,0 +1 @@
+1.7
diff --git a/test4/Job34_Routing.txt b/test4/Job34_Routing.txt
@@ -0,0 +1 @@
+7, 7, 7
diff --git a/test4/Job34_Time.txt b/test4/Job34_Time.txt
@@ -0,0 +1 @@
+9, 9, 9
diff --git a/test4/Job3_Routing.txt b/test4/Job3_Routing.txt
@@ -0,0 +1 @@
+1, 1
diff --git a/test4/Job3_Time.txt b/test4/Job3_Time.txt
@@ -0,0 +1 @@
+1.8, 7
diff --git a/test4/Job4_Routing.txt b/test4/Job4_Routing.txt
@@ -0,0 +1 @@
+2, 2
diff --git a/test4/Job4_Time.txt b/test4/Job4_Time.txt
@@ -0,0 +1 @@
+4, 7.3
diff --git a/test4/Job5_Routing.txt b/test4/Job5_Routing.txt
@@ -0,0 +1 @@
+6, 2, 2 
diff --git a/test4/Job5_Time.txt b/test4/Job5_Time.txt
@@ -0,0 +1 @@
+4.9, 1.8, 1.6
diff --git a/test4/Job6_Routing.txt b/test4/Job6_Routing.txt
@@ -0,0 +1 @@
+2, 2, 2 
diff --git a/test4/Job6_Time.txt b/test4/Job6_Time.txt
@@ -0,0 +1 @@
+7, 6.9, 7.4 
diff --git a/test4/Job7_Routing.txt b/test4/Job7_Routing.txt
@@ -0,0 +1 @@
+3, 3
diff --git a/test4/Job7_Time.txt b/test4/Job7_Time.txt
@@ -0,0 +1 @@
+7.9, 2.2
diff --git a/test4/Job8_Routing.txt b/test4/Job8_Routing.txt
@@ -0,0 +1 @@
+3
diff --git a/test4/Job8_Time.txt b/test4/Job8_Time.txt
@@ -0,0 +1 @@
+7.5
diff --git a/test4/Job9_Routing.txt b/test4/Job9_Routing.txt
@@ -0,0 +1 @@
+3
diff --git a/test4/Job9_Time.txt b/test4/Job9_Time.txt
@@ -0,0 +1 @@
+4.2
diff --git a/test4/Mesin.txt b/test4/Mesin.txt
@@ -0,0 +1 @@
+5, 7.3, 7.5, 9, 1, 3.3, 0
