Skip to content

Commit 02a28ad

Browse files
KiskaeKiskae
committed
Add "global" collection result "<all>", All Modularization results have been modified to provide the most accurate results possible.
1 parent 7925d2a commit 02a28ad

File tree

8 files changed

+91
-6
lines changed

8 files changed

+91
-6
lines changed

‎src/main/java/nl/rug/jbi/jsm/core/calculator/BaseMetric.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
* @since 2014-06-01
1414
*/
1515
public abstract class BaseMetric {
16+
/**
17+
* Global Collection identifier, used when a result concerns ALL input, not just select parts of it.
18+
*/
19+
public final static String GLOBAL_COLLECTION_IDENTIFIER = "<all>";
20+
1621
private final MetricScope scope;
1722

1823
BaseMetric(final MetricScope scope) {

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPE.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,16 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
6666
}
6767

6868
final List<MetricResult> results = Lists.newLinkedList();
69-
69+
final Set<String> globalExtSumP = DEF_SET_STRING.get();
70+
final Set<String> globalExtSumC = DEF_SET_STRING.get();
7071
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
71-
final double ExtSumP = ((Set) entry.getValue().get("ExtSumP")).size();
72-
final int ExtSumC = ((Set) entry.getValue().get("ExtSumC")).size();
72+
final Set<String> ExtSumPSet = (Set<String>) entry.getValue().get("ExtSumP");
73+
final double ExtSumP = ExtSumPSet.size();
74+
globalExtSumP.addAll(ExtSumPSet);
75+
76+
final Set<String> ExtSumCSet = (Set<String>) entry.getValue().get("ExtSumC");
77+
final int ExtSumC = ExtSumCSet.size();
78+
globalExtSumC.addAll(ExtSumCSet);
7379

7480
results.add(MetricResult.getResult(
7581
entry.getKey(),
@@ -79,6 +85,15 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
7985
));
8086
}
8187

88+
final double ExtSumP = globalExtSumP.size();
89+
final int ExtSumC = globalExtSumC.size();
90+
results.add(MetricResult.getResult(
91+
GLOBAL_COLLECTION_IDENTIFIER,
92+
IIPE.class,
93+
MetricScope.COLLECTION,
94+
1 - (ExtSumC != 0 ? ExtSumP / ExtSumC : 0)
95+
));
96+
8297
return results;
8398
}
8499
}

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPED.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
7676
collectionData.getOrSet(collectionName, "result", DEF_ATOMIC_DOUBLE).addAndGet(result);
7777
}
7878

79+
double gResult = 0.0;
7980
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
8081
final double result = ((AtomicDouble) entry.getValue().get("result")).doubleValue();
8182
final int packageCount = ((AtomicInteger) entry.getValue().get("PackageCount")).intValue();
8283

84+
gResult += result;
85+
8386
results.add(MetricResult.getResult(
8487
entry.getKey(),
8588
IIPED.class,
@@ -88,6 +91,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
8891
));
8992
}
9093

94+
results.add(MetricResult.getResult(
95+
GLOBAL_COLLECTION_IDENTIFIER,
96+
IIPED.class,
97+
MetricScope.COLLECTION,
98+
gResult / states.size()
99+
));
100+
91101
return results;
92102
}
93103

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPU.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,16 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
6666
}
6767

6868
final List<MetricResult> results = Lists.newLinkedList();
69-
69+
final Set<String> globalUsesSumP = DEF_SET_STRING.get();
70+
final Set<String> globalUsesSumC = DEF_SET_STRING.get();
7071
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
71-
final double UsesSumP = ((Set) entry.getValue().get("UsesSumP")).size();
72-
final int UsesSumC = ((Set) entry.getValue().get("UsesSumC")).size();
72+
final Set<String> UsesSumPSet = (Set<String>) entry.getValue().get("UsesSumP");
73+
final double UsesSumP = UsesSumPSet.size();
74+
globalUsesSumP.addAll(UsesSumPSet);
75+
76+
final Set<String> UsesSumCSet = (Set<String>) entry.getValue().get("UsesSumC");
77+
final int UsesSumC = UsesSumCSet.size();
78+
globalUsesSumC.addAll(UsesSumCSet);
7379

7480
results.add(MetricResult.getResult(
7581
entry.getKey(),
@@ -79,6 +85,15 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
7985
));
8086
}
8187

88+
final double UsesSumP = globalUsesSumP.size();
89+
final int UsesSumC = globalUsesSumC.size();
90+
results.add(MetricResult.getResult(
91+
GLOBAL_COLLECTION_IDENTIFIER,
92+
IIPU.class,
93+
MetricScope.COLLECTION,
94+
1 - (UsesSumC != 0 ? UsesSumP / UsesSumC : 0)
95+
));
96+
8297
return results;
8398
}
8499
}

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPUD.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
7676
collectionData.getOrSet(collectionName, "result", DEF_ATOMIC_DOUBLE).addAndGet(result);
7777
}
7878

79+
double gResult = 0.0;
7980
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
8081
final double result = ((AtomicDouble) entry.getValue().get("result")).doubleValue();
8182
final int packageCount = ((AtomicInteger) entry.getValue().get("PackageCount")).intValue();
8283

84+
gResult += result;
85+
8386
results.add(MetricResult.getResult(
8487
entry.getKey(),
8588
IIPUD.class,
@@ -88,6 +91,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
8891
));
8992
}
9093

94+
results.add(MetricResult.getResult(
95+
GLOBAL_COLLECTION_IDENTIFIER,
96+
IIPUD.class,
97+
MetricScope.COLLECTION,
98+
gResult / states.size()
99+
));
100+
91101
return results;
92102
}
93103

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IPCI.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
8080
collectionData.getOrSet(collectionName, "result", DEF_ATOMIC_DOUBLE).addAndGet(result);
8181
}
8282

83+
double gResult = 0.0;
8384
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
8485
final double result = ((AtomicDouble) entry.getValue().get("result")).doubleValue();
8586
final int packageCount = ((AtomicInteger) entry.getValue().get("PackageCount")).intValue();
8687

88+
gResult += result;
89+
8790
results.add(MetricResult.getResult(
8891
entry.getKey(),
8992
IPCI.class,
@@ -92,6 +95,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
9295
));
9396
}
9497

98+
results.add(MetricResult.getResult(
99+
GLOBAL_COLLECTION_IDENTIFIER,
100+
IPCI.class,
101+
MetricScope.COLLECTION,
102+
gResult / states.size()
103+
));
104+
95105
return results;
96106
}
97107

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IPSC.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
9898
collectionData.getOrSet(collectionName, "result", DEF_ATOMIC_DOUBLE).addAndGet(result);
9999
}
100100

101+
double gResult = 0.0;
101102
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
102103
final double result = ((AtomicDouble) entry.getValue().get("result")).doubleValue();
103104
final int packageCount = ((AtomicInteger) entry.getValue().get("PackageCount")).intValue();
104105

106+
gResult += result;
107+
105108
results.add(MetricResult.getResult(
106109
entry.getKey(),
107110
IPSC.class,
@@ -110,6 +113,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
110113
));
111114
}
112115

116+
results.add(MetricResult.getResult(
117+
GLOBAL_COLLECTION_IDENTIFIER,
118+
IPSC.class,
119+
MetricScope.COLLECTION,
120+
gResult / states.size()
121+
));
122+
113123
return results;
114124
}
115125

‎src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/PF.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
8888
collectionData.getOrSet(collectionName, "result", DEF_ATOMIC_DOUBLE).addAndGet(result);
8989
}
9090

91+
double gResult = 0.0;
9192
for (final Map.Entry<String, Map<String, Object>> entry : collectionData.getEntrySetByCollection()) {
9293
final double result = ((AtomicDouble) entry.getValue().get("result")).doubleValue();
9394
final int packageCount = ((AtomicInteger) entry.getValue().get("PackageCount")).intValue();
9495

96+
gResult += result;
97+
9598
results.add(MetricResult.getResult(
9699
entry.getKey(),
97100
PF.class,
@@ -100,6 +103,13 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
100103
));
101104
}
102105

106+
results.add(MetricResult.getResult(
107+
GLOBAL_COLLECTION_IDENTIFIER,
108+
PF.class,
109+
MetricScope.COLLECTION,
110+
gResult / states.size()
111+
));
112+
103113
return results;
104114
}
105115

0 commit comments

Comments
 (0)