Merge branch 'feature-ga' of mmka:unres into feature-ga

[unres.git] / source / ga / GA.f

diff --git a/source/ga/GA.f b/source/ga/GA.f
index 3446217..0173d36 100644 (file)
--- a/source/ga/GA.f
+++ b/source/ga/GA.f
@@ -213,31 +213,37 @@ c --- debug end ---
            if (populacja(i,20).lt.bank(j,20)) then
             write(tmptext,'(I4)') j
             write(tmptext2,'(I4)') i
-            call write2log("Swaping ind"//trim(tmptext)//" from bank to &
-     &ind "//trim(tmptext2)//" from population")
-            write(tmptext2,'(21F7.5)') bank(j,:)
-            call write2log("BANK"//trim(tmptext)//":"//trim(tmptext2))
+            call write2log("  Swaping ind"//trim(tmptext)//" from bank t&
+     &o ind "//trim(tmptext2)//" from population")
+            write(tmptext2,'(19F8.5,E15.7,F8.5)') bank(j,:)
+            call write2log("  BANK"//trim(tmptext)//":"//trim(tmptext2))
 
             write(tmptext,'(I4)') i
-            write(tmptext2,'(21F7.5)') populacja(i,:)
-            call write2log("POP"//trim(tmptext)//":"//trim(tmptext2))
+            write(tmptext2,'(19F8.5,E15.7,F8.5)') populacja(i,:)
+            call write2log("  POP "//trim(tmptext)//":"//trim(tmptext2))
       
             bank(j,:)=populacja(i,:)
+           else
+            call write2log("  Found simialar but not better")
            endif
           else              ! W banku nie ma podobnego 
            j=FindWorst(banksize,bank)
-           write(tmptext,'(I4)') j
+           write(tmptext2,'(I4)') j
            if (populacja(i,20).lt.bank(j,20)) then
-            call write2log("Worst in bank is "//trim(tmptext))
-            write(tmptext2,'(21F7.5)') bank(j,:)
-            call write2log("BANK"//trim(tmptext)//":"//trim(tmptext2))
-           
+            call write2log("  Worst in bank is "//trim(tmptext2))
+            write(tmptext,'(I4)') i
+            call write2log("  Swaping worst ind in bank to "//trim(tmpte&
+     &xt))
+            write(tmptext,'(I4)') j
+            write(tmptext2,'(19F8.5,E15.7,F8.5)') bank(j,:)
+            call write2log("  BANK"//trim(tmptext)//":"//trim(tmptext2))
             write(tmptext,'(I4)') i
-            call write2log("Swaping worst ind in bank to "//trim(tmptext&
-     &))
-            write(tmptext2,'(21F7.5)') populacja(i,:)
-            call write2log("POP"//trim(tmptext)//":"//trim(tmptext2))
+            write(tmptext2,'(19F8.5,E15.7,F8.5)') populacja(i,:)
+            call write2log("  POP "//trim(tmptext)//":"//trim(tmptext2))
             bank(j,:)=populacja(i,:)
+           else
+            call write2log("  The worst in bank is better then this Ind"&
+     &)
            endif
           endif
          enddo
@@ -1316,7 +1322,7 @@ c        call write2log("Delta is "//tmp)
           mindelta=delta
           pozycja=i
           write(tmp,'(F7.5,X,I4)') delta,pozycja
-          call write2log("Delta is "//tmp)
+          call write2log("  Delta is "//tmp)
         endif
       end do