From e3de298b7f59bb5438206b21a80a578ee7c4f18f Mon Sep 17 00:00:00 2001 From: Dawid Jagiela Date: Wed, 14 Mar 2012 12:05:53 +0100 Subject: [PATCH] csacutoff fix --- source/ga/GA.f | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/ga/GA.f b/source/ga/GA.f index 47a65a5..2304bfd 100644 --- 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)) + + 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 @@ -243,12 +247,6 @@ c --- debug end --- 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" -- 1.7.9.5