projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3de298
)
more verbose swaping in bank
author
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Thu, 29 Mar 2012 12:23:00 +0000
(14:23 +0200)
committer
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Thu, 29 Mar 2012 12:23:00 +0000
(14:23 +0200)
source/ga/GA.f
patch
|
blob
|
history
diff --git
a/source/ga/GA.f
b/source/ga/GA.f
index
2304bfd
..
ef6ba72
100644
(file)
--- a/
source/ga/GA.f
+++ b/
source/ga/GA.f
@@
-209,7
+209,7
@@
c --- debug end ---
write(tmptext,'(I4)') i
call write2log("Checking ind "//trim(tmptext))
j=ZnajdzPodobnego(banksize,bank,populacja(i,:),csacutoff)
write(tmptext,'(I4)') i
call write2log("Checking ind "//trim(tmptext))
j=ZnajdzPodobnego(banksize,bank,populacja(i,:),csacutoff)
- if (j.gt.0) then
+ if (j.gt.0) then ! W banku jest podobny
if (populacja(i,20).lt.bank(j,20)) then
write(tmptext,'(I4)') j
write(tmptext2,'(I4)') i
if (populacja(i,20).lt.bank(j,20)) then
write(tmptext,'(I4)') j
write(tmptext2,'(I4)') i
@@
-217,14
+217,18
@@
c --- debug end ---
&ind "//trim(tmptext2)//" from population")
bank(j,:)=populacja(i,:)
endif
&ind "//trim(tmptext2)//" from population")
bank(j,:)=populacja(i,:)
endif
- else
+ else ! W banku nie ma podobnego
j=FindWorst(banksize,bank)
write(tmptext,'(I4)') j
write(tmptext2,'(I4)') i
if (populacja(i,20).lt.bank(j,20)) then
call write2log("Worst in bank is "//trim(tmptext))
j=FindWorst(banksize,bank)
write(tmptext,'(I4)') j
write(tmptext2,'(I4)') i
if (populacja(i,20).lt.bank(j,20)) then
call write2log("Worst in bank is "//trim(tmptext))
+ write(tmptext,'(21F7.5)') bank(j,:)
+ call write2log("BANK:"//trim(tmptext))
call write2log("Swaping worst ind in bank to "//trim(tmptext&
&2))
call write2log("Swaping worst ind in bank to "//trim(tmptext&
&2))
+ write(tmptext,'(21F7.5)') populacja(i,:)
+ call write2log("POP :"//trim(tmptext))
bank(j,:)=populacja(i,:)
endif
endif
bank(j,:)=populacja(i,:)
endif
endif