Rebasing on develop.

DRAMSys/traceAnalyzer/CMakeLists.txt

@@ -143,11 +143,6 @@ add_executable(TraceAnalyzer
     businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp
     businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
 
-    businessObjects/dramTimeDependencies/dramtimedependenciesIF.cpp
-    businessObjects/dramTimeDependencies/DDR3TimeDependencies.cpp
-    businessObjects/dramTimeDependencies/dramtimedependencyfactory.cpp
-    businessObjects/phasedependenciestracker.cpp
-
     selectmetrics.ui
     preferences.ui
     evaluationtool.ui

DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h

@@ -35,49 +35,9 @@
 
 #pragma once
 
-#include <algorithm>
-#include <vector>
-#include <map>
-
-#include <QJsonDocument>
-#include <QJsonValue>
-#include <QJsonArray>
-#include <QJsonObject>
-
 #include "data/tracedb.h"
-#include "businessObjects/phases/phasedependency.h"
-
-class TimeDependency {
-public:
-    TimeDependency() = default;
-    TimeDependency(size_t timeValue, QString phaseDep, DependencyType depType, 
-                   QString timeDepName, bool considerIntraRank = false)
-    : timeValue{timeValue}, phaseDep{phaseDep}, depType{depType}, 
-      timeDepName{timeDepName}, considerIntraRank{considerIntraRank} {}
-
-    size_t timeValue;
-    QString phaseDep;
-    DependencyType depType;
-    QString timeDepName;
-    bool considerIntraRank = false; // Used only for InterRank skip check in PhaseDependenciesTracker::mCalculateDependencies
-
-};
-
-struct PhaseTimeDependencies {
-    explicit PhaseTimeDependencies(std::initializer_list<TimeDependency> d) : dependencies(d) {}
-
-    std::vector<TimeDependency> dependencies;
-    size_t maxTime;
-};
-
-
-struct QStringsComparator {
-    bool operator()(const QString& s1, const QString& s2);
-    static bool compareQStrings(const QString& s1, const QString& s2);
-};
-
-typedef std::map<QString, PhaseTimeDependencies, QStringsComparator> DependencyMap;
-
+#include "businessObjects/dramTimeDependencies/common/common.h"
+#include "poolcontrollermap.h"
 
 class DRAMTimeDependenciesBase {
 public:
@@ -88,12 +48,11 @@ public:
 
     const uint getClk() const { return tCK; }
 
-    const uint getClk() const { return clk; }
-    const uint getNAW() const { return nActivateWindow; };
+    PoolControllerMap getPools() const;
 
 protected:
-    void mFilterDependencyList(std::vector<TimeDependency>& dependencyList, const std::vector<QString>& dependencyFilter) const;
-    void mFilterDependencyMap(DependencyMap& dependencyMap, const std::vector<QString>& dependencyFilter) const;
+    void mFilterDependencyList(std::vector<TimeDependency>& dependencyList, const std::vector<StringMapper>& dependencyFilter) const;
+    void mFilterDependencyMap(DependencyMap& dependencyMap, const std::vector<StringMapper>& dependencyFilter) const;
     uint mFindVectorMaximum(const std::vector<TimeDependency>& dependencyList) const;
     
 protected:
@@ -106,5 +65,7 @@ protected:
     
     uint tCK = 0;
 
+    std::map<StringMapper, PoolController> mPools;
+
 };
 

DRAMSys/traceAnalyzer/presentation/util/colorgenerator.cpp

@@ -63,6 +63,5 @@ QColor ColorGenerator::getRainbowColored(unsigned int i, ColorName color)
     return {0, 0, 0};
 }
 
-
 ColorDefault ColorGenerator::cDefault;
 ColorHSV15 ColorGenerator::cHSV15;

DRAMSys/traceAnalyzer/tracefiletab.ui

@@ -226,17 +226,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QListWidget" name="depTabPossiblePhases">
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="calculateDependencies">
-          <property name="text">
-           <string>Calculate Dependencies</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>