hdiff output

r31528/keywords.f 2016-11-20 16:30:11.462163591 +0000 r31527/keywords.f 2016-11-20 16:30:12.214173587 +0000
2146:             WRITE(MYUNIT,'(A)') 'keyword> Rescaling inputs by mean absolute values:'2146:             WRITE(MYUNIT,'(A)') 'keyword> Rescaling inputs by mean absolute values:'
2147:             WRITE(MYUNIT,'(6G20.10)') MLPMEAN(1:MLPIN)2147:             WRITE(MYUNIT,'(6G20.10)') MLPMEAN(1:MLPIN)
2148:             DO J1=1,MLPIN2148:             DO J1=1,MLPIN
2149:                MLPDAT(1:MLPDATA,J1)=MLPDAT(1:MLPDATA,J1)/MLPMEAN(J1)2149:                MLPDAT(1:MLPDATA,J1)=MLPDAT(1:MLPDATA,J1)/MLPMEAN(J1)
2150:             ENDDO2150:             ENDDO
2151:          ENDIF2151:          ENDIF
2152:          DEALLOCATE(MLPMEAN)2152:          DEALLOCATE(MLPMEAN)
2153:          MLPDONE=.TRUE.2153:          MLPDONE=.TRUE.
2154:       ELSE IF (WORD.EQ.'MLPB3NEW') THEN2154:       ELSE IF (WORD.EQ.'MLPB3NEW') THEN
2155:          MLP3T=.TRUE.2155:          MLP3T=.TRUE.
2156:          MLPB3T=.TRUE. 
2157:          MLPB3NEWT=.TRUE.2156:          MLPB3NEWT=.TRUE.
2158:          CALL READI(MLPIN)      ! number of inputs (data items after outcome)2157:          CALL READI(MLPIN)      ! number of inputs (data items after outcome)
2159:          CALL READI(MLPSTART) ! starting position in data list, not counting outcome2158:          CALL READI(MLPSTART) ! starting position in data list, not counting outcome
2160:          CALL READI(MLPHIDDEN)2159:          CALL READI(MLPHIDDEN)
2161:          CALL READI(MLPOUT)2160:          CALL READI(MLPOUT)
2162:          CALL READI(MLPDATA)2161:          CALL READI(MLPDATA)
2163:          IF (NITEMS.GT.5) CALL READF(MLPLAMBDA)2162:          IF (NITEMS.GT.5) CALL READF(MLPLAMBDA)
2164:          WRITE(MYUNIT,'(A,5I8,G20.10)') 'MLP3 new potential bias nodes and Nin, Ninstart, Nhidden, Nout, Ndata, lambda=',2163:          WRITE(MYUNIT,'(A,5I8,G20.10)') 'MLP3 new potential bias nodes and Nin, Ninstart, Nhidden, Nout, Ndata, lambda=',
2165:      &                                MLPIN,MLPSTART,MLPHIDDEN,MLPOUT,MLPDATA,MLPLAMBDA  2164:      &                                MLPIN,MLPSTART,MLPHIDDEN,MLPOUT,MLPDATA,MLPLAMBDA  
2166:          NMLP=MLPHIDDEN*(MLPIN+MLPOUT)+12165:          NMLP=MLPHIDDEN*(MLPIN+MLPOUT)+1


r31528/MLPB3.f90 2016-11-20 16:30:10.966156995 +0000 r31527/MLPB3.f90 2016-11-20 16:30:11.714166942 +0000
 74:       DUMMY3=DUMMY3+EXP(Y(J4)) 74:       DUMMY3=DUMMY3+EXP(Y(J4))
 75:    ENDDO 75:    ENDDO
 76:    DO J4=1,MLPOUT 76:    DO J4=1,MLPOUT
 77:       PROB(J4)=EXP(Y(J4))/DUMMY3 77:       PROB(J4)=EXP(Y(J4))/DUMMY3
 78:    ENDDO 78:    ENDDO
 79:    PMLPOUTJ1=PROB(MLPOUTJ1) 79:    PMLPOUTJ1=PROB(MLPOUTJ1)
 80: !  IF (DEBUG) THEN 80: !  IF (DEBUG) THEN
 81: !     WRITE(*,'(A,I8,A)') 'MLP3> data point ',J1,' outputs and probabilities:' 81: !     WRITE(*,'(A,I8,A)') 'MLP3> data point ',J1,' outputs and probabilities:'
 82: !     WRITE(*,'(8G15.5)') Y(1:MLPOUT),PROB(1:MLPOUT) 82: !     WRITE(*,'(8G15.5)') Y(1:MLPOUT),PROB(1:MLPOUT)
 83: !  ENDIF 83: !  ENDIF
 84: !  WRITE(MYUNIT,'(A,I8,A,2G20.10)') 'MLPB3> data point ',J1,' energy and log=',ENERGY,-LOG(PMLPOUTJ1) 
 85:    ENERGY=ENERGY-LOG(PMLPOUTJ1) 84:    ENERGY=ENERGY-LOG(PMLPOUTJ1)
 86:    IF (GTEST) THEN 85:    IF (GTEST) THEN
 87: ! 86: !
 88: ! We only need the probability derivative for the probability corresponding to the correct outcome for this data point 87: ! We only need the probability derivative for the probability corresponding to the correct outcome for this data point
 89: ! 88: !
 90:       DPCW1BG(1:MLPOUT,1:MLPHIDDEN)=0.0D0 89:       DPCW1BG(1:MLPOUT,1:MLPHIDDEN)=0.0D0
 91:       DO J2=1,MLPHIDDEN 90:       DO J2=1,MLPHIDDEN
 92:          DO J4=1,MLPOUT 91:          DO J4=1,MLPOUT
 93:             DPCW1BG(J4,J2)=DPCW1BG(J4,J2)-PMLPOUTJ1*PROB(J4)*DYW1G(J2) 92:             DPCW1BG(J4,J2)=DPCW1BG(J4,J2)-PMLPOUTJ1*PROB(J4)*DYW1G(J2)
 94:          ENDDO 93:          ENDDO
128:       V(BOFFSET+1)=V(BOFFSET+1)-(DYCDBHID(MLPOUTJ1)-DUMMY2)127:       V(BOFFSET+1)=V(BOFFSET+1)-(DYCDBHID(MLPOUTJ1)-DUMMY2)
129:       DPCDBHIDOUTJ1=PMLPOUTJ1*(DYCDBHID(MLPOUTJ1)-DUMMY2)128:       DPCDBHIDOUTJ1=PMLPOUTJ1*(DYCDBHID(MLPOUTJ1)-DUMMY2)
130:          129:          
131:       DO J4=1,MLPOUT130:       DO J4=1,MLPOUT
132:          DPCDBHID(J4)=PROB(J4)*(DYCDBHID(J4)-DUMMY2)131:          DPCDBHID(J4)=PROB(J4)*(DYCDBHID(J4)-DUMMY2)
133:       ENDDO132:       ENDDO
134: 133: 
135:       DO J4=1,MLPOUT134:       DO J4=1,MLPOUT
136:          DO J2=1,MLPHIDDEN135:          DO J2=1,MLPHIDDEN
137:             V(MLPOFFSET+(J4-1)*MLPHIDDEN+J2)=V(MLPOFFSET+(J4-1)*MLPHIDDEN+J2)-DPCW1BG(J4,J2)/PMLPOUTJ1136:             V(MLPOFFSET+(J4-1)*MLPHIDDEN+J2)=V(MLPOFFSET+(J4-1)*MLPHIDDEN+J2)-DPCW1BG(J4,J2)/PMLPOUTJ1
138: !          WRITE(MYUNIT,'(A,I8,A,2G20.10)') 'MLP3> data point ',J1,' j2,j3 and V=',J2,J3,V(MLPOFFSET+(J4-1)*MLPHIDDEN+J2) 
139:          ENDDO137:          ENDDO
140:       ENDDO138:       ENDDO
141: 139: 
142:       DO J3=1,MLPIN140:       DO J3=1,MLPIN
143:          DO J2=1,MLPHIDDEN141:          DO J2=1,MLPHIDDEN
144:             V((J2-1)*MLPIN+J3)=V((J2-1)*MLPIN+J3)-DPCW2BG(J2,J3)/PMLPOUTJ1142:             V((J2-1)*MLPIN+J3)=V((J2-1)*MLPIN+J3)-DPCW2BG(J2,J3)/PMLPOUTJ1
145: !          WRITE(MYUNIT,'(A,I8,A,2G20.10)') 'MLP3> data point ',J1,' j2,j3 and V=',J2,J3,V((J2-1)*MLPIN+J3) 
146:          ENDDO143:          ENDDO
147:       ENDDO144:       ENDDO
148:    ENDIF145:    ENDIF
149: 146: 
150:    IF (SECT) THEN147:    IF (SECT) THEN
151: 148: 
152:       DUMMY2=0.0D0149:       DUMMY2=0.0D0
153:       DO J4=1,MLPOUT150:       DO J4=1,MLPOUT
154:          DUMMY2=DUMMY2+PROB(J4)*DYCDBHID(J4)151:          DUMMY2=DUMMY2+PROB(J4)*DYCDBHID(J4)
155:       ENDDO152:       ENDDO


r31528/MLQ.f90 2016-11-20 16:30:11.214160294 +0000 r31527/MLQ.f90 2016-11-20 16:30:11.962170236 +0000
 58:    DUMMY3=0.0D0 58:    DUMMY3=0.0D0
 59:    DO J4=1,MLQOUT 59:    DO J4=1,MLQOUT
 60:       Y(J4)=Y(J4)-DMAX 60:       Y(J4)=Y(J4)-DMAX
 61:       DUMMY3=DUMMY3+EXP(Y(J4)) 61:       DUMMY3=DUMMY3+EXP(Y(J4))
 62:    ENDDO 62:    ENDDO
 63:    DO J4=1,MLQOUT 63:    DO J4=1,MLQOUT
 64:       PROB(J4)=EXP(Y(J4))/DUMMY3 64:       PROB(J4)=EXP(Y(J4))/DUMMY3
 65:    ENDDO 65:    ENDDO
 66:    PMLQOUTJ1=PROB(MLQOUTJ1) ! this is p_c(d), the probability predicted for the known outcome for data point d 66:    PMLQOUTJ1=PROB(MLQOUTJ1) ! this is p_c(d), the probability predicted for the known outcome for data point d
 67:    IF (PMLQOUTJ1.LE.0.0D0) THEN 67:    IF (PMLQOUTJ1.LE.0.0D0) THEN
 68:       IF (DEBUG) WRITE(MYUNIT,'(A,G20.10)') 'WARNING PROB=',PROB(MLQOUTJ1) 68:       WRITE(MYUNIT,'(A,G20.10)') 'WARNING PROB=',PROB(MLQOUTJ1)
 69:       PMLQOUTJ1=1.0D-100 69:       PMLQOUTJ1=1.0D-100
 70: !     WRITE(MYUNIT,'(I10,G20.10)') (J4,PROB(J4),J4=1,MLQOUT) 70: !     WRITE(MYUNIT,'(I10,G20.10)') (J4,PROB(J4),J4=1,MLQOUT)
 71: !     STOP 71: !     STOP
 72:    ENDIF 72:    ENDIF
 73:    ENERGY=ENERGY-LOG(PMLQOUTJ1) ! summing over contributions for data points, indexed by J1 73:    ENERGY=ENERGY-LOG(PMLQOUTJ1) ! summing over contributions for data points, indexed by J1
 74: !  WRITE(MYUNIT,'(A,I8,2G20.10)') 'J1,PMLQOUTJ1,ENERGY=',J1,PMLQOUTJ1,ENERGY 74: !  WRITE(MYUNIT,'(A,I8,2G20.10)') 'J1,PMLQOUTJ1,ENERGY=',J1,PMLQOUTJ1,ENERGY
 75:  75: 
 76:    IF (GTEST) THEN 76:    IF (GTEST) THEN
 77: ! 77: !
 78: ! We only need the probability derivatives for the probability corresponding to the correct outcome for this data point 78: ! We only need the probability derivatives for the probability corresponding to the correct outcome for this data point


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0