Skip to content

Commit 583ae44

Browse files
committed
BugFix: Forgotten Reset of Internal Sum Added
1 parent 7fcc022 commit 583ae44

File tree

1 file changed

+5
-29
lines changed

1 file changed

+5
-29
lines changed

src/main/java/org/optimizationBenchmarking/evaluator/attributes/clusters/behavior/_DistanceBuilderSumMaxLog.java

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ private static final double __dist(final DimensionRelationshipData a,
7070
return 0d;
7171
}
7272

73-
if (orig <= 0d) {
74-
return dist;// orig = Double.MIN_NORMAL;
73+
if (orig > 0d) {
74+
dist /= orig;// orig = Double.MIN_NORMAL;
7575
}
76-
return Math.max(0d,
77-
(Math.log(Math.E + Math.max(0d, (dist / orig))) - 1d));
76+
return Math.max(0d, (Math.log(Math.E + Math.max(0d, dist)) - 1d));
7877
}
7978

8079
/** {@inheritDoc} */
@@ -88,6 +87,8 @@ protected final void setDistance(final int i, final int j,
8887
int index1, index2;
8988

9089
sum = this.m_sum;
90+
sum.reset();
91+
9192
index1 = (-1);
9293
for (final DimensionRelationshipData[] dataA : this.m_data[i]) {
9394
dataB = this.m_data[j][++index1];
@@ -112,31 +113,6 @@ protected final void setDistance(final int i, final int j,
112113
}
113114
}
114115

115-
// /** {@inheritDoc} */
116-
// @Override
117-
// protected final double getDistance(int i, int j) {
118-
// DimensionRelationshipData[] dataB;
119-
// DimensionRelationshipData b;
120-
// double max, current;
121-
// int index1, index2;
122-
//
123-
// max = Double.NEGATIVE_INFINITY;
124-
// index1 = (-1);
125-
// for (DimensionRelationshipData[] dataA : this.m_data[i]) {
126-
// dataB = this.m_data[j][++index1];
127-
// index2 = (-1);
128-
// for (DimensionRelationshipData a : dataA) {
129-
// b = dataB[++index2];
130-
// current = Math.min(__dist(a, b), __dist(b, a));
131-
// if (current > max) {
132-
// max = current;
133-
// }
134-
// }
135-
// }
136-
//
137-
// return max;
138-
// }
139-
140116
/** {@inheritDoc} */
141117
@Override
142118
protected final void releaseElement(final int i) {

0 commit comments

Comments
 (0)