#453 fix ccm metrics calculation

cqfn · Apr 20, 2020 · f4fc5d7 · f4fc5d7
1 parent 14744f6
commit f4fc5d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/org/jpeek/skeleton/XmlClass.java b/src/main/java/org/jpeek/skeleton/XmlClass.java
@@ -46,12 +46,6 @@
  *
  * @see <a href="http://www.pitt.edu/~ckemerer/CK%20research%20papers/MetricForOOD_ChidamberKemerer94.pdf">A packages suite for object oriented design</a>
  * @since 0.27
- * @todo #447:30min This class includes the constructor as part of the methods
- * it considers, so it breaks some of the metrics. For example the CCM metrics
- * test on OverloadMethods (see metricstest-params.csv) expects 0.6 as a result
- * while it should be 1. See #447 for details on that. Find out if the constructor
- * should be counted as one of the methods or not (does it depend on the metrics
- * for example?) and fix it this class and the tests if needed.
  * @checkstyle AbbreviationAsWordInNameCheck (5 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @checkstyle ParameterNumberCheck (500 lines)

diff --git a/src/main/resources/org/jpeek/metrics/CCM.xsl b/src/main/resources/org/jpeek/metrics/CCM.xsl
@@ -41,7 +41,7 @@ SOFTWARE.
  </metric>
  </xsl:template>
  <xsl:template match="class">
- <xsl:variable name="methods" select="methods/method"/>
+ <xsl:variable name="methods" select="methods/method[@ctor='false']"/>
  <xsl:variable name="edges">
  <xsl:for-each select="$methods">
  <xsl:variable name="method" select="."/>

diff --git a/src/test/resources/org/jpeek/metricstest-params.csv b/src/test/resources/org/jpeek/metricstest-params.csv
@@ -36,7 +36,7 @@ TwoCommonAttributes,NHD,0.3333d
 OneVoidMethodWithoutParams,NHD,NaN
 WithoutAttributes,NHD,0.0d
 OneMethodCreatesLambda,NHD,0.0d
-MethodsWithDiffParamTypes,CCM,0.0476d
+MethodsWithDiffParamTypes,CCM,0.0667d
 Foo,SCOM,0.5d
 MethodsWithDiffParamTypes,SCOM,0.2381d
 OverloadMethods,SCOM,0.75d
@@ -113,11 +113,11 @@ NoMethods,CCM,NaN
 WithoutAttributes,CCM,NaN
 OneMethodCreatesLambda,CCM,NaN
 OneVoidMethodWithoutParams,CCM,NaN
-Bar,CCM,0.125d
-Foo,CCM,0.1667d
-OverloadMethods,CCM,0.6d
+Bar,CCM,0.2222d
+Foo,CCM,0.5d
+OverloadMethods,CCM,1.0d
 TwoCommonAttributes,CCM,NaN
-TwoCommonMethods,CCM,0.0238d
+TwoCommonMethods,CCM,0.0333d
 Bar,MWE,1.0d
 Foo,MWE,1.0d
 MethodMethodCalls,MWE,1.0d