Merge branch 'master' into relational_cohesion_modules

Author: mcserep

plugins/cpp_metrics/model/include/model/cppfilemetrics.h

@@ -14,6 +14,7 @@ struct CppFileMetrics
   enum Type
   {
     EFFERENT_MODULE,
+    AFFERENT_MODULE,
     RELATIONAL_COHESION_MODULE
   };
 

plugins/cpp_metrics/model/include/model/cpptypedependencymetrics.h

@@ -71,12 +71,26 @@ struct CppTypeDependencyMetrics_Count
   object(CppAstNode = DependencyAstNode : CppTypeDependencyMetrics::dependencyHash == DependencyAstNode::entityHash \
     && DependencyAstNode::astType == cc::model::CppAstNode::AstType::Definition) \
   object(File = DependencyFile : DependencyAstNode::location.file == DependencyFile::id)
-struct CppTypeDependencyMetricsPathViewDistinctCount
+struct CppTypeDependencyMetrics_Distinct_D_Count
 {
   #pragma db column("count(distinct" + CppTypeDependencyMetrics::dependencyHash + ")")
   std::size_t count;
 };
 
+#pragma db view \
+  object(CppTypeDependencyMetrics) \
+  object(CppAstNode = EntityAstNode : CppTypeDependencyMetrics::entityHash == EntityAstNode::entityHash \
+    && EntityAstNode::astType == cc::model::CppAstNode::AstType::Definition) \
+  object(File = EntityFile : EntityAstNode::location.file == EntityFile::id) \
+  object(CppAstNode = DependencyAstNode : CppTypeDependencyMetrics::dependencyHash == DependencyAstNode::entityHash \
+    && DependencyAstNode::astType == cc::model::CppAstNode::AstType::Definition) \
+  object(File = DependencyFile : DependencyAstNode::location.file == DependencyFile::id)
+struct CppTypeDependencyMetrics_Distinct_E_Count
+{
+  #pragma db column("count(distinct" + CppTypeDependencyMetrics::entityHash + ")")
+  std::size_t count;
+};
+
 } // model
 } // cc
 

plugins/cpp_metrics/parser/include/cppmetricsparser/cppmetricsparser.h

@@ -82,6 +82,8 @@ class CppMetricsParser : public AbstractParser
   void afferentTypeLevel();
   // Calculate the efferent coupling at module level.
   void efferentModuleLevel();
+  // Calculate the afferent coupling at module level.
+  void afferentModuleLevel();
   // Calculate relational cohesion at module level.
   void relationalCohesionModuleLevel();
   // Returns module path query based on parser configuration.
@@ -209,7 +211,7 @@ class CppMetricsParser : public AbstractParser
   static const int efferentCouplingTypesPartitionMultiplier = 5;
   static const int afferentCouplingTypesPartitionMultiplier = 5;
   static const int efferentCouplingModulesPartitionMultiplier = 5;
-  static const int relationalCohesionPartitionMultiplier = 5;
+  static const int afferentCouplingModulesPartitionMultiplier = 5;
 };
 
 } // parser

plugins/cpp_metrics/parser/src/cppmetricsparser.cpp

@@ -557,12 +557,12 @@ void CppMetricsParser::efferentModuleLevel()
     {
       util::OdbTransaction{_ctx.db}([&, this]
       {
-        typedef odb::query<model::CppTypeDependencyMetricsPathViewDistinctCount> TypeDependencyQuery;
-        typedef model::CppTypeDependencyMetricsPathViewDistinctCount TypeDependencyResult;
+        typedef odb::query<model::CppTypeDependencyMetrics_Distinct_D_Count> TypeDependencyQuery;
+        typedef model::CppTypeDependencyMetrics_Distinct_D_Count TypeDependencyResult;
 
         for (const model::File& file : tasks)
         {
-          TypeDependencyResult types = _ctx.db->query_value<model::CppTypeDependencyMetricsPathViewDistinctCount>(
+          TypeDependencyResult types = _ctx.db->query_value<model::CppTypeDependencyMetrics_Distinct_D_Count>(
             TypeDependencyQuery::EntityFile::path.like(file.path + '%') &&
             !TypeDependencyQuery::DependencyFile::path.like(file.path + '%'));
 
@@ -576,6 +576,35 @@ void CppMetricsParser::efferentModuleLevel()
   });
 }
 
+void CppMetricsParser::afferentModuleLevel()
+{
+  parallelCalcMetric<model::File>(
+    "Afferent coupling at module level",
+    _threadCount * afferentCouplingModulesPartitionMultiplier,// number of jobs; adjust for granularity
+    getModulePathsQuery(),
+    [&, this](const MetricsTasks<model::File>& tasks)
+    {
+      util::OdbTransaction{_ctx.db}([&, this]
+      {
+        typedef odb::query<model::CppTypeDependencyMetrics_Distinct_E_Count> TypeDependencyQuery;
+        typedef model::CppTypeDependencyMetrics_Distinct_E_Count TypeDependencyResult;
+
+        for (const model::File& file : tasks)
+        {
+          TypeDependencyResult types = _ctx.db->query_value<model::CppTypeDependencyMetrics_Distinct_E_Count>(
+            !TypeDependencyQuery::EntityFile::path.like(file.path + '%') &&
+            TypeDependencyQuery::DependencyFile::path.like(file.path + '%'));
+
+          model::CppFileMetrics metric;
+          metric.file = file.id;
+          metric.type = model::CppFileMetrics::Type::AFFERENT_MODULE;
+          metric.value = types.count;
+          _ctx.db->persist(metric);
+        }
+      });
+  });
+}
+
 void CppMetricsParser::relationalCohesionModuleLevel()
 {
   // Compute relational cohesion defined by CppDepend:
@@ -641,6 +670,8 @@ bool CppMetricsParser::parse()
   afferentTypeLevel();
   LOG(info) << "[cppmetricsparser] Computing efferent coupling metric at module level.";
   efferentModuleLevel(); // This metric needs to be calculated after efferentTypeLevel
+  LOG(info) << "[cppmetricsparser] Computing afferent coupling metric at module level.";
+  afferentModuleLevel(); // This metric needs to be calculated after afferentTypeLevel
   LOG(info) << "[cppmetricsparser] Computing relational cohesion metric at module level.";
   relationalCohesionModuleLevel(); // This metric needs to be calculated after efferentTypeLevel
   return true;

plugins/cpp_metrics/test/sources/parser/module_d/d1.h

@@ -0,0 +1,15 @@
+#ifndef CC_CPP_MODULE_METRICS_TEST_D1
+#define CC_CPP_MODULE_METRICS_TEST_D1
+
+#include "../module_c/c1.h"
+#include "../module_c/c2.h"
+
+namespace CC_CPP_MODULE_METRICS_TEST
+{
+class D1 {
+  C1 c1;
+  C2 c2;
+};
+}
+
+#endif

plugins/cpp_metrics/test/sources/parser/modulemetrics.cpp

@@ -4,6 +4,7 @@
 #include "./module_b/b2.h"
 #include "./module_c/c1.h"
 #include "./module_c/c2.h"
+#include "./module_d/d1.h"
 
 #include "./rc_module_a/a1.h"
 #include "./rc_module_a/a2.h"

plugins/cpp_metrics/test/src/cppmetricsparsertest.cpp

@@ -331,9 +331,10 @@ class ParameterizedEfferentModuleCouplingTest
 {};
 
 std::vector<StringUintParam> paramEfferentModule = {
-  {"%/test/sources/parser/module_a", 1},
+  {"%/test/sources/parser/module_a", 1}, // B1
   {"%/test/sources/parser/module_b", 0},
-  {"%/test/sources/parser/module_c", 2},
+  {"%/test/sources/parser/module_c", 2}, // A2, B1
+  {"%/test/sources/parser/module_d", 2}, // C1, C2
 };
 
 TEST_P(ParameterizedEfferentModuleCouplingTest, ModuleEfferentTest) {
@@ -355,6 +356,39 @@ INSTANTIATE_TEST_SUITE_P(
   ::testing::ValuesIn(paramEfferentModule)
 );
 
+// Afferent coupling at module level
+
+class ParameterizedAfferentModuleCouplingTest
+  : public CppMetricsParserTest,
+    public ::testing::WithParamInterface<StringUintParam>
+{};
+
+std::vector<StringUintParam> paramAfferentModule = {
+  {"%/test/sources/parser/module_a", 1}, // C2
+  {"%/test/sources/parser/module_b", 3}, // A2, C1, C2
+  {"%/test/sources/parser/module_c", 1}, // D1
+  {"%/test/sources/parser/module_d", 0},
+};
+
+TEST_P(ParameterizedAfferentModuleCouplingTest, ModuleAfferentTest) {
+  _transaction([&, this]() {
+
+    typedef odb::query<model::CppModuleMetricsForPathView> CppModuleMetricsQuery;
+
+    const auto metric = _db->query_value<model::CppModuleMetricsForPathView>(
+      CppModuleMetricsQuery::CppFileMetrics::type == model::CppFileMetrics::Type::AFFERENT_MODULE &&
+      CppModuleMetricsQuery::File::path.like(GetParam().first));
+
+    EXPECT_EQ(GetParam().second, metric.value);
+  });
+}
+
+INSTANTIATE_TEST_SUITE_P(
+  ParameterizedAfferentModuleCouplingTestSuite,
+  ParameterizedAfferentModuleCouplingTest,
+  ::testing::ValuesIn(paramAfferentModule)
+);
+
 // Relational cohesion at module level
 
 class ParameterizedRelationalCohesionTest
@@ -391,4 +425,4 @@ INSTANTIATE_TEST_SUITE_P(
   ParameterizedRelationalCohesionTestSuite,
   ParameterizedRelationalCohesionTest,
   ::testing::ValuesIn(paramRelationalCohesion)
-);
+);