- propMatrix[0][i][j]+= pph.get(ic).equals(pph.get(jc)) ? pph.get(ic) : -1;
- propMatrix[1][i][j]+= pph.get(ic).equals(pph.get(jc)) ? 1 : -1;
- propMatrix[2][i][j]+= pph.get(ic).equals(pph.get(jc)) ? pph.get(ic)*2 : 0;
- }
+ if (pph.get(ic)!=null && pph.get(jc)!=null) {
+ int icp=pph.get(ic).intValue(),jcp=pph.get(jc).intValue();
+
+ propMatrixPos[i][j] += icp == jcp ? icp : -1;
+ propMatrixPos[j][i] += icp == jcp ? icp : -1;
+ propMatrixF[i][j] += icp == jcp ? 2 : -1;
+ propMatrixF[j][i] += icp == jcp ? 2 : -1;
+ propMatrixEpos[i][j] += icp == jcp ? (1+icp * 2) : -1;
+ propMatrixEpos[j][i] += icp == jcp ? (1+icp * 2) : -1;
+ }}