projects
/
unres.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecc2bc1
)
csacutoff fix
author
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Wed, 14 Mar 2012 11:05:53 +0000
(12:05 +0100)
committer
Dawid Jagiela
<lightnir@chem.univ.gda.pl>
Wed, 14 Mar 2012 11:05:53 +0000
(12:05 +0100)
source/ga/GA.f
patch
|
blob
|
history
diff --git
a/source/ga/GA.f
b/source/ga/GA.f
index
47a65a5
..
2304bfd
100644
(file)
--- a/
source/ga/GA.f
+++ b/
source/ga/GA.f
@@
-200,6
+200,10
@@
c --- debug end ---
call ReadBank(bank)
write(tmptext,'(F7.5)') avrd
call write2log("Average distance in bank is "//trim(tmptext))
call ReadBank(bank)
write(tmptext,'(F7.5)') avrd
call write2log("Average distance in bank is "//trim(tmptext))
+
+ csacutoff=maxco*avrd-generation*avrd*(maxco-minco)/maxgen
+ write(tmptext,'(F7.5)') csacutoff
+ call write2log("CSA cutoff is now set to "//trim(tmptext))
do i=1,BANK_MULTIPLIER*banksize
write(tmptext,'(I4)') i
do i=1,BANK_MULTIPLIER*banksize
write(tmptext,'(I4)') i
@@
-243,12
+247,6
@@
c --- debug end ---
call WriteBank(bank)
call WriteBank(bank)
- csacutoff=maxco*avrd-generation*avrd*(maxco-minco)/maxgen
-c csacutoff=csacutoff-(generation*cicutoff/maxgen)
-c csacutoff=cicutoff*(0.8**(iter-1))
-
- write(tmptext,'(F7.5)') csacutoff
- call write2log("CSA cutoff is now set to "//trim(tmptext))
endif
case('cluster')
write(*,*) "Some stuff here in the future"
endif
case('cluster')
write(*,*) "Some stuff here in the future"