Commit f6293b98 authored by ofgeorg's avatar ofgeorg

removed comparisons with .FALSE. and .TRUE. values

parent 71bea7fc
......@@ -304,8 +304,6 @@
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug Single Matlab|Win32">
......@@ -325,8 +323,6 @@
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug Single Matlab|Win32">
......@@ -342,8 +338,6 @@
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" FixedFormLineLength="fixedLength132"/></FileConfiguration>
<FileConfiguration Name="Debug Single Matlab|Win32">
......@@ -441,8 +435,7 @@
<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true"/>
<FileConfiguration Name="Debug Single Matlab|Win32" ExcludedFromBuild="true"/>
<FileConfiguration Name="DebugMPI|x64" ExcludedFromBuild="true"/></File></Filter>
<File RelativePath=".\libtestfcns\benchmark_bobb.f90">
<FileConfiguration Name="DebugMPI|x64" ExcludedFromBuild="true"/></File>
<File RelativePath=".\libtestfcns\benchmark_bbob.f90"/>
<File RelativePath=".\libtestfcns\CEC2005.f90"/>
<File RelativePath=".\libtestfcns\double_funnel.f90"/>
<File RelativePath=".\libtestfcns\random_landscape.f90"/>
......@@ -451,6 +444,7 @@
<Filter Name="Random Numbers">
<File RelativePath=".\librng\faure.f90"/>
<File RelativePath=".\librng\halton.f90"/>
<File RelativePath=".\librng\kinds.f90"/>
<File RelativePath=".\librng\niederreiter2.f90"/>
<File RelativePath=".\librng\qr_gen_mod.f90"/>
<File RelativePath=".\librng\random_generator.f"/>
......
......@@ -106,7 +106,7 @@
options%countBFGSit = 0
DO
IF (options%use_LJ .EQV. .TRUE.) THEN
IF (options%use_LJ ) THEN
CALL LJ_GRAD(f,x,g,n,1) !IF we do Lennard Jones optimization use the analytical gradient
ELSE
IF (options%Benchfctnr .EQ. 9) THEN
......@@ -152,7 +152,7 @@
REAL(MK) :: f_plus,f_minus
IF (options%BFGS_central_difference .EQV. .TRUE.) THEN
IF (options%BFGS_central_difference ) THEN
DO i = 1, n
xtmp = x
xtmp(i) = xtmp(i) + options%BFGS_grad_stepsize/2
......
#------------------------------------------------------------------------
# pCMALib: a parallel fortran 90 library for the evolution strategy with
# covariance matrix adaptation
# Christian L. Mueller, Benedikt Baumgartner, Georg Ofenbeck
# MOSAIC group, ETH Zurich, Switzerland
#-------------------------------------------------------------------------
# output data is saved into this folder (relative to workdir)
OUTPUT_FOLDER = rast_ipop
# which function of the CEC2005 or BBOB benchmark suite to use
BENCHFCTNR = 9
# Dimension of the problem
DIMENSIONS = 10
# Upper bounds on all dimensions
ALLDIM_UBOUNDS = 5
# Lower bounds on all dimensions
ALLDIM_LBOUNDS = -5
#the global optimum
GLOBAL_MIN = -330
# use the CEC2005 benchmark suite as target function
USE_CEC = true
# usage of Quasi Random Sampling
QR_SAMPLING = true
# this only works with Sobol R implementation! (0) no scrambling
# (1)owen type scrambling, (2)faure-tezuka type scrambling,
# (3)owen,faure-tezuka type scrambling
QR_SCRAMBLING = 0
# (0)Moros Inverse, (1)Peter J. Acklam.s Inverter, (2)Inverter from R
QR_INVERTER = 1
# (0)Sobol, (1)Sobol R implementation, (2)Halton, (3)Halton R
# implementation, (4)Faure (buggy!), (5)Niederreiter
QR_SAMPLER = 1
# Successful run if global_min -f(x) < accuracy
ACCURACY = 1.E-8
# if multi restart CMA (IPOP) should be used
RESTART_CMA = true
# (0) restart randomly within bounds, (1) restart from point of
# convergence, (2) restart from same startpoint all the time
RESTART_TYPE = 1
# factor by which the population size is increased every restart
INCPOPSIZE = 1.3
#the folder where to find the supportData folder
CECFOLDERS = ./
#------------------------------------------------------------------------
# pCMALib: a parallel fortran 90 library for the evolution strategy with
# covariance matrix adaptation
# Christian L. Mueller, Benedikt Baumgartner, Georg Ofenbeck
# MOSAIC group, ETH Zurich, Switzerland
#-------------------------------------------------------------------------
# output data is saved into this folder (relative to workdir)
OUTPUT_FOLDER = rast_ipop
# which function of the CEC2005 or BBOB benchmark suite to use
BENCHFCTNR = 9
# Dimension of the problem
DIMENSIONS = 10
# Upper bounds on all dimensions
ALLDIM_UBOUNDS = 5
# Lower bounds on all dimensions
ALLDIM_LBOUNDS = -5
#the global optimum
GLOBAL_MIN = -330
# use the CEC2005 benchmark suite as target function
USE_CEC = true
# usage of Quasi Random Sampling
QR_SAMPLING = true
# this only works with Sobol R implementation! (0) no scrambling
# (1)owen type scrambling, (2)faure-tezuka type scrambling,
# (3)owen,faure-tezuka type scrambling
QR_SCRAMBLING = 0
# (0)Moros Inverse, (1)Peter J. Acklam.s Inverter, (2)Inverter from R
QR_INVERTER = 1
# (0)Sobol, (1)Sobol R implementation, (2)Halton, (3)Halton R
# implementation, (4)Faure (buggy!), (5)Niederreiter
QR_SAMPLER = 1
# Successful run if global_min -f(x) < accuracy
ACCURACY = 1.E-8
# if multi restart CMA (IPOP) should be used
RESTART_CMA = true
# (0) restart randomly within bounds, (1) restart from point of
# convergence, (2) restart from same startpoint all the time
RESTART_TYPE = 1
# factor by which the population size is increased every restart
INCPOPSIZE = 1.3
#the folder where to find the supportData folder
CECFOLDERS = ./
......@@ -80,30 +80,30 @@
! Start CMA-ES/PS-CMA-ES
IF (options%use_TIP .EQV. .TRUE.) THEN
IF (options%use_TIP ) THEN
CALL cmaes_start(TIP4P,options%xstart,options%insigma)
ELSEIF (options%use_LJ .EQV. .TRUE.) THEN
ELSEIF (options%use_LJ ) THEN
CALL cmaes_start(LJ,options%xstart,options%insigma)
ELSEIF (options%use_LJ_comp .EQV. .TRUE.) THEN
ELSEIF (options%use_LJ_comp ) THEN
CALL cmaes_start(LJ_POT_COMP,options%xstart,options%insigma)
ELSEIF (options%use_DF .EQV. .TRUE.) THEN
ELSEIF (options%use_DF ) THEN
CALL cmaes_start(DoubleFunnel,options%xstart,options%insigma)
ELSEIF (options%use_CEC .EQV. .TRUE.) THEN
ELSEIF (options%use_CEC ) THEN
CALL cmaes_start(benchmark,options%xstart,options%insigma)
ELSEIF (options%use_BBOB .EQ. .TRUE.) THEN
ELSEIF (options%use_BBOB ) THEN
#ifdef __BBOB
CALL cmaes_start(benchmark_bbob,options%xstart,options%insigma)
#else
WRITE(*,*) 'You compiled CMA without BBOB and therefore cant call it'
#endif
ELSEIF (options%use_MATFUNC .EQV. .TRUE.) THEN
ELSEIF (options%use_MATFUNC ) THEN
#ifdef __HAVE_MATLAB__
CALL cmaes_start(matlab_objfunc,options%xstart,options%insigma)
#else
WRITE(*,*) 'You compiled CMA without MATLAB support and therefore cant call it'
#endif
ELSEIF (options%use_RANDOM_LANDSCAPE .EQV. .TRUE.) THEN
ELSEIF (options%use_RANDOM_LANDSCAPE ) THEN
CALL ZBQLINI(1)
CALL cmaes_start(random_landscape,options%xstart,options%insigma) !this is mainly to test CMA-ES behaviour
ELSE
......
......@@ -31,7 +31,7 @@
!-------------------------------------------------------------------------
! Deallocate CEC2005 memory
!-------------------------------------------------------------------------
IF (options%use_CEC .EQV. .TRUE.) THEN
IF (options%use_CEC ) THEN
CALL close_benchmark()
ENDIF
!-------------------------------------------------------------------------
......
......@@ -477,7 +477,7 @@
IF (options%abs_sigma .NE. 0.0_MK) THEN
options%insigma(:) = options%abs_sigma
ELSEIF(options%rel_sigma .NE. 0) THEN
IF (options%use_init_bounds .EQV. .TRUE.) THEN
IF (options%use_init_bounds ) THEN
options%insigma(:) = options%rel_sigma*&
& (options%init_uBounds-options%init_lBounds)
ELSE
......@@ -495,7 +495,7 @@
! Initalize the Seed for the Programm
!------------------------------------------------------------------------
IF (options%use_seed .EQV. .FALSE.) THEN
IF (.NOT. options%use_seed) THEN
CALL SYSTEM_CLOCK(options%seed)
ELSE
carg = TRIM(options%seed_folder)
......
......@@ -140,7 +140,7 @@
! Initialize array for the Convergence History
!-------------------------------------------------------------------------
tmpint = options%StopMaxFunEvals / options%record_modulo
IF (options%record_besthist .EQV. .TRUE.) THEN
IF (options%record_besthist ) THEN
ALLOCATE(besthist(tmpint),stat=allocStat)
besthist(:) = 0
END IF
......@@ -420,7 +420,7 @@
! Create random number
!-------------------------------------------------------------------
IF (options%qr_sampling .EQV. .TRUE.) THEN
IF (options%qr_sampling ) THEN
CALL qr_generator(input%N,1,options%seed,darz(:,k),&
& options%qr_sampler,options%qr_inverter)
ELSE
......@@ -468,7 +468,7 @@
!-------------------------------------------------------------------
! Replace Sample point / Sample Fitness via BFGS
!-------------------------------------------------------------------
IF (options%BFGS_use .EQV. .TRUE.) THEN
IF (options%BFGS_use ) THEN
IF (options%BFGS_position .EQ. 1) THEN
CALL lbfgsb(fitfun,input%N,17,arxvalid(:,k),options%LBounds,&
& options%UBounds,fitness%raw(k))
......@@ -543,7 +543,7 @@
be5 = abs(options%global_min - bestever%f)
END IF
#endif
IF (options%flgGenData .EQV. .TRUE.) THEN
IF (options%flgGenData ) THEN
WRITE(uNum+18,*) abs(options%global_min - bestever%f)
END IF
END IF
......@@ -552,7 +552,7 @@
! Save bestever history for the convergence graph
! See Suganthan Benchmark Paper
!-----------------------------------------------------------------------
IF (options%record_besthist .EQV. .TRUE.) THEN
IF (options%record_besthist ) THEN
tmpint = countEval / options%record_modulo
IF ( tmpint .GT. 0) THEN
IF ( besthist(tmpint) .EQ. 0 ) THEN
......@@ -573,7 +573,7 @@
#ifdef __HAVE_MATLAB__
acc_evals = countEval
#endif
IF (options%flgGenData .EQV. .TRUE.) THEN
IF (options%flgGenData ) THEN
tmp_dir=trim(adjustl(options%output_folder)) &
& // '/acc.txt'
OPEN(unit=73,file=tmp_dir,status='replace', action='write',&
......@@ -1067,7 +1067,7 @@
IF((countEval .GE. options%StopFunEvals) .OR. &
(countIter .GE.options%StopIter)) stopflag = 'stopFunEvals'
IF (options%StopTime .EQV. .TRUE.) THEN
IF (options%StopTime ) THEN
CALL CPU_TIME(time_end)
tmpreal = time_end - time_start
IF (tmpreal .GT. (options%StopTimeHH*60+options%StopTimeMM)*60+ &
......@@ -1097,10 +1097,10 @@
IF(options%VerboseModulo > 0) THEN
IF(countIter .EQ. 1) THEN
#ifdef __HAVE_MPI__
IF(MY_RANK .EQ. 0 .OR. (options%silentMPI .EQV. .FALSE.)) THEN
IF(MY_RANK .EQ. 0 .OR. (.NOT. options%silentMPI )) THEN
WRITE(*,*) '******************************************************'
WRITE(*,*) 'Started MPI-CMA'
IF (options%silentMPI .EQV. .TRUE.) THEN
IF (options%silentMPI ) THEN
WRITE(*,*) 'To guarantee a decent console output',&
& ' only Process 0 is shown'
END IF
......@@ -1108,7 +1108,7 @@
'folder ' // options%output_folder
WRITE(*,*) '******************************************************'
IF(options%pscma) THEN
IF(MY_RANK .EQ. 0 .OR. (options%silentMPI .EQV. .FALSE.)) THEN
IF(MY_RANK .EQ. 0 .OR. (.NOT. options%silentMPI)) THEN
WRITE(*,*) '---------------------------------'
WRITE(*,*) 'PSO configuration:'
WRITE(*,*) 'Weight: ', options%psoWeight
......@@ -1136,12 +1136,12 @@
END IF
#ifdef __HAVE_MPI__
IF(MY_RANK .EQ. 0 .OR. options%silentMPI .EQV. .FALSE.) THEN
IF(MY_RANK .EQ. 0 .OR. .NOT. options%silentMPI) THEN
#endif
IF((mod(countIter, options%VerboseModulo) .EQ. 0) &
.OR. (stopflag .NE. '') .OR. (countIter .EQ. 1)) THEN
WRITE(*,*) countIter, ',', countEval, ':', fitness%hist(1)
IF (options%use_LJ .EQV. .TRUE. .AND. options%write_pdb .EQV. .TRUE.) THEN
IF (options%use_LJ .AND. options%write_pdb ) THEN
WRITE(tmp_char,'(I10)') countIter
tmp_dir=trim(adjustl(options%output_folder))&
& // '/LJ' &
......@@ -1152,7 +1152,7 @@
CALL LJ_write_out(tmp_dir,xmin,input%N,1)
END IF
IF (options%use_TIP .EQV. .TRUE. .AND. options%write_pdb .EQV. .TRUE.) THEN
IF (options%use_TIP .AND. options%write_pdb ) THEN
WRITE(tmp_char,'(I10)') countIter
tmp_dir=trim(adjustl(options%output_folder))&
& // '/WATER' &
......@@ -1196,13 +1196,13 @@
END DO genLoop
100 IF (options%restart_cma .EQV. .TRUE. .AND. stopflag .NE. 'bug' .AND. &
100 IF (options%restart_cma .AND. stopflag .NE. 'bug' .AND. &
&stopflag .NE. 'fitness' &
& .AND. stopflag .NE. 'maxfunevals' .AND. stopflag .NE. 'maxiter' .AND. &
& stopflag .NE. 'stopTime') THEN
WRITE(*,*) countIter, ',', countEval, ':', fitness%hist(1)
IF (options%use_LJ .EQV. .TRUE. .AND. options%write_pdb .EQV. .TRUE.) THEN
IF (options%use_LJ .AND. options%write_pdb ) THEN
WRITE(tmp_char,'(I10)') countIter
tmp_dir=trim(adjustl(options%output_folder))&
& // '/LJ' &
......@@ -1213,7 +1213,7 @@
CALL LJ_write_out(tmp_dir,xmin,input%N,1)
END IF
IF (options%use_TIP .EQV. .TRUE. .AND. options%write_pdb .EQV. .TRUE.) THEN
IF (options%use_TIP .AND. options%write_pdb ) THEN
WRITE(tmp_char,'(I10)') countIter
tmp_dir=trim(adjustl(options%output_folder))&
& // '/WATER' &
......
......@@ -67,9 +67,9 @@
!-------------------------------------------------------------------------
! Initialize CEC2005 parameters if benchmark is used
!-------------------------------------------------------------------------
IF (options%use_CEC .EQ. .TRUE.) THEN
IF (options%use_CEC ) THEN
CALL prepare_benchmark(options%Benchfctnr,options%dimensions,1)
ELSEIF (options%use_BBOB .EQ. .TRUE.) THEN
ELSEIF (options%use_BBOB ) THEN
i = options%dimensions
#ifdef __BBOB
CALL init_BBOB(i,options%Benchfctnr,&
......@@ -152,10 +152,10 @@
!-------------------------------------------------------------------------
! free CEC2005 resources if benchmark is used
!-------------------------------------------------------------------------
IF (options%use_CEC .EQ. .TRUE.) THEN
IF (options%use_CEC ) THEN
CALL close_benchmark()
ENDIF
IF (options%use_BBOB .EQ. .TRUE.) THEN
IF (options%use_BBOB ) THEN
#ifdef __BBOB
CALL fgeneric_finalize()
#endif
......
......@@ -47,7 +47,7 @@
END IF
IF (first_init .EQV. .TRUE. .OR. options%restart_type .EQ. 0) THEN
IF (first_init .OR. options%restart_type .EQ. 0) THEN
! Initialize MPI
#ifdef __HAVE_MPI__
! Init random number generator
......@@ -56,7 +56,7 @@
CALL ZBQLINI(options%seed+MY_RANK**2)
CALL MPI_BARRIER(MPI_COMM_WORLD, IERR)
DO i = 1,options%dimensions
IF (options%use_init_bounds .EQV. .TRUE.) THEN
IF (options%use_init_bounds ) THEN
options%xstart(i) = ZBQLUAB(options%init_lBounds,&
& options%init_uBounds)
ELSE
......@@ -68,14 +68,14 @@
#else
! Init random number generator
IF (options%use_seed .EQV. .FALSE.) THEN
IF (.NOT. options%use_seed) THEN
CALL ZBQLINI(options%seed)
END IF
tmpint = options%seed + 1
options%seed = tmpint
DO i = 1,options%dimensions
IF (options%use_init_bounds .EQV. .TRUE.) THEN
IF (options%use_init_bounds ) THEN
options%xstart(i) = ZBQLUAB(options%init_lBounds,&
& options%init_uBounds)
ELSE
......@@ -106,7 +106,7 @@
IF (first_init .EQV. .FALSE.) THEN
IF (.NOT. first_init) THEN
!CALL cmaes_reinitialize(options%xstart,options%dimensions)
!if options%MaxIncFac is negative then it can always increase
......
......@@ -162,7 +162,7 @@
matbe5 = be5
matacc_evals = acc_evals
IF (options%record_besthist .EQ. .TRUE.) THEN
IF (options%record_besthist ) THEN
mathist = besthist
END IF
......@@ -435,7 +435,7 @@
!-------------------------------------------------------------------------
! write bestever history
!-------------------------------------------------------------------------
IF (options%record_besthist .EQ. .TRUE.) THEN
IF (options%record_besthist ) THEN
mInd = options%StopMaxFunEvals / options%record_modulo
nInd = 1
pbesthistory = mxCreateDoubleMatrix(mInd,nInd,0)
......@@ -498,7 +498,7 @@
!-------------------------------------------------------------------------
! write Be4,Be5,Be3,acc_evals
!------------------------------------------------------------------------
IF (options%benchmark .EQ. .TRUE.) THEN
IF (options%benchmark ) THEN
pbe3 = mxCreateDoubleScalar(matbe3)
status = matPutVariable(mp, 'be3'//trim(adjustl(proc)), &
pbe3)
......
......@@ -1190,7 +1190,7 @@
END IF
END DO
IF (boundviolation .EQV. .TRUE.) THEN
IF (boundviolation ) THEN
res = testf_NAN
ELSE
......@@ -1315,7 +1315,7 @@
IF (hybrid_nr .EQ. 17) THEN
IF (noise .EQV. .TRUE.) THEN
IF (noise ) THEN
res = res * (1.0_MK + 0.2_MK * ABS(ZBQLNOR(0.0_MK,1.0_MK)))! * THE NOISE FUNCTION HERE!)
END IF
END IF
......@@ -1489,7 +1489,7 @@
DO i = 1,m
sum = sum + vars(i)**2
END DO
IF (noise .EQV. .TRUE.) THEN
IF (noise ) THEN
sum = sum * (1.0_MK + 0.1 * ABS(ZBQLNOR(0.0_MK,1.0_MK)))
END IF
res = sum
......@@ -1871,7 +1871,7 @@
DO j = 1,n
res(j) = 0.0_MK
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -1962,7 +1962,7 @@
res = 0.0_MK
DO j = 1,n
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -2057,7 +2057,7 @@
!rotate the input
DO i=1,n
IF (boundviolation(i) .EQV. .FALSE.) THEN
IF (.NOT. boundviolation(i)) THEN
DO j=1,m
tmp_result(j) = 0.0_MK
DO k=1,m
......@@ -2073,7 +2073,7 @@
DO j = 1,n
res(j) = 0.0_MK
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -2139,7 +2139,7 @@
DO i = 1,n
IF (res(i) .NE. testf_NAN) THEN
res(i) = (res(i) - biases(2))
IF (noise .EQV. .TRUE.) THEN
IF (noise ) THEN
res(i) = res(i)*(1.0_MK + 0.4_MK *ABS(ZBQLNOR(0.0_MK,1.0_MK)))! * THE NOISE FUNCTION HERE!)
END IF
res(i) = res(i) + biases(4)
......@@ -2219,7 +2219,7 @@
res = 0.0_MK
DO i = 1,n
IF (boundviolation(i) .EQV. .TRUE.) THEN
IF (boundviolation(i) ) THEN
res(i) = testf_NAN
ELSE
CALL Ax(m,tmparray,vars(:,i),rotatematrix)
......@@ -2313,7 +2313,7 @@
res = 0.0_MK
DO j = 1,n
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m - 1
......@@ -2406,7 +2406,7 @@
!rotate the input
DO i=1,n
IF (boundviolation(i) .EQV. .FALSE.) THEN
IF (.NOT. boundviolation(i)) THEN
DO j=1,m
tmp_result(j) = 0.0_MK
DO k=1,m
......@@ -2421,7 +2421,7 @@
DO j = 1,n
prod=1
sum=0
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -2514,7 +2514,7 @@
!rotate the input
DO i=1,n
IF (boundviolation (i) .EQV. .FALSE.) THEN
IF (.NOT. boundviolation(i) ) THEN
DO j=1,m
tmp_result(j) = 0.0d0
DO k=1,m
......@@ -2531,7 +2531,7 @@
e1 = 0.0_MK
e2 = 0.0_MK
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -2622,7 +2622,7 @@
DO j = 1,n
sum=0
IF(boundviolation(j) .EQV. .TRUE.) THEN
IF(boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
sum = 10.0d0 * m
......@@ -2714,7 +2714,7 @@
sum=0
IF(boundviolation .EQV. .TRUE.) THEN
IF(boundviolation ) THEN
grad = testf_NAN
ELSE
DO i = 1,m
......@@ -2802,7 +2802,7 @@
!rotate the input
DO i=1,n
IF (boundviolation(i) .EQV. .FALSE.) THEN
IF (.NOT. boundviolation(i)) THEN
DO j=1,m
tmp_result(j) = 0.0_MK
DO k=1,m
......@@ -2818,7 +2818,7 @@
DO j = 1,n
sum=0
IF(boundviolation(j) .EQV. .TRUE.) THEN
IF(boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
sum = 10.0d0 * m
......@@ -2911,7 +2911,7 @@
!rotate the input
DO i=1,n
IF (boundviolation(i) .EQV. .FALSE.) THEN
IF (.NOT. boundviolation(i)) THEN
DO j=1,m
tmp_result(j) = 0.0_MK
DO k=1,m
......@@ -2929,7 +2929,7 @@
sum1 = 0.0_MK
sum2 = 0.0_MK
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
DO i = 1,m
......@@ -3032,7 +3032,7 @@
END IF
END DO
IF (boundviolation(j) .EQV. .TRUE.) THEN
IF (boundviolation(j) ) THEN
res(j) = testf_NAN
ELSE
res(j) = sum + biases(12)