From 4659125d0ad3561a002f7869c598abdda559c1e8 Mon Sep 17 00:00:00 2001
From: dhruvr4 <dhruvr4@LAPTOP-318TOE61.localdomain>
Date: Wed, 4 Aug 2021 03:29:08 -0500
Subject: [PATCH 1/2] Done

---
 src/projections/analysis/IntervalData.java | 77 +++++-----------------
 1 file changed, 16 insertions(+), 61 deletions(-)

diff --git a/src/projections/analysis/IntervalData.java b/src/projections/analysis/IntervalData.java
index 99df4aa9..9cba0603 100644
--- a/src/projections/analysis/IntervalData.java
+++ b/src/projections/analysis/IntervalData.java
@@ -128,63 +128,25 @@ public void loadSumDetailIntervalData(long intervalSize, int intervalStart,
                 ii++;
             }
         }
-    }
-    /**
-     *  This is a method for use with the older way of doing things only.
-     *  Regretably, it's needed to get things working for now.
-     *
-     *  The method fills 3 arrays - systemUsageData, systemMsgsData
-     *                              and userEntryData
-     *  given time-range specifications.
-     */
-    public void loadIntervalData(long intervalSize, int intervalStart,
-				 int intervalEnd, boolean byEntryPoint,
-				 SortedSet<Integer> processorList) {
-        int numIntervals = intervalEnd - intervalStart + 1;
-	systemUsageData = new int[3][processorList.size()][numIntervals];
-	systemMsgsData = new int[5][3][processorList.size()][numIntervals];
-	if (byEntryPoint) {
-	    userEntryData = 
-		new int[numEPs][3][processorList.size()][numIntervals];
-	}
-	double tempData[][] = null;
-	int processorCount = 0;
-	for(Integer curPe : processorList) {
-	    // get standard data
-	    tempData = getData(curPe, TYPE_TIME, intervalSize, intervalStart,
-			       intervalEnd-intervalStart+1);
-	    // copy into userEntryData, if byEntryPoint is true,
-	    // accumulate into systemUsageData.
-	    for (int i=0; i<numIntervals; i++) {
-		for (int ep=0; ep<numEPs; ep++) {
-		    if (byEntryPoint) {
-			userEntryData[ep][2][processorCount][i] =
-			    (int)tempData[ep][i];
-		    }
-		    systemUsageData[1][processorCount][i] +=
-			(int)tempData[ep][i];
-		}
-		// after accumulation for systemUsageData, convert to %util
-		systemUsageData[1][processorCount][i] =
-		    (int)IntervalUtils.timeToUtil(systemUsageData[1][processorCount][i],
-						  intervalSize);
-	    }
 
-	    // get message data
-	    tempData = getData(curPe, TYPE_NUM_MSGS, intervalSize,
-			       intervalStart, intervalEnd-intervalStart+1);
-	    // accumulate into systemMsgsData
-	    for (int i=0; i<numIntervals; i++) {
-		for (int ep=0; ep<numEPs; ep++) {
-		    systemMsgsData[1][2][processorCount][i] +=
-			(int)tempData[ep][i];
+		systemUsageData = new int[3][processorList.size()][numIntervals];
+		int processorCount = 0;
+
+		for(Integer curPe : processorList) {
+			// get standard data
+			tempData = getData(curPe, TYPE_TIME, intervalSize, intervalStart,
+					intervalEnd-intervalStart+1);
+			// accumulate into systemUsageData.
+			for (int i=0; i<numIntervals; i++) {
+				for (int ep=0; ep<numEPs; ep++) {
+					systemUsageData[1][processorCount][i] +=(int)tempData[ep][i];
+				}
+			// after accumulation for systemUsageData, convert to %util
+				systemUsageData[1][processorCount][i] =(int)IntervalUtils.timeToUtil(systemUsageData[1][processorCount][i],intervalSize);
+			}
+			processorCount++;
 		}
-	    }
-
-	    processorCount++;
-	}
     }
-
 	public int[][] getSumDetailData_interval_EP() {
 		return sumDetailData_interval_EP;
 	}
@@ -201,13 +163,6 @@ public int[][][] getSystemUsageData() {
 	return systemUsageData;
     }
 
-    public int[][][][] getSystemMsgs() {
-	return systemMsgsData;
-    }
-
-    public int[][][][] getUserEntries() {
-	return userEntryData;
-    }
 
     
     /**

From 535494a0f9dfe5a83bee6b074f082b17af6cd8d7 Mon Sep 17 00:00:00 2001
From: Ronak Buch <rabuch2@illinois.edu>
Date: Thu, 5 Aug 2021 22:48:35 -0400
Subject: [PATCH 2/2] SumDetail: Consolidate and reformat
 loadSumDetailIntervalData

---
 src/projections/analysis/IntervalData.java | 53 +++++++++-------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/projections/analysis/IntervalData.java b/src/projections/analysis/IntervalData.java
index 9cba0603..8d230f99 100644
--- a/src/projections/analysis/IntervalData.java
+++ b/src/projections/analysis/IntervalData.java
@@ -107,46 +107,35 @@ public IntervalData() {
         System.out.println("IntervalData - hasSumDetailData + numIntervals: "+numIntervals+" intervalSize: " + intervalSize);
 	}
     }
-    public void loadSumDetailIntervalData(long intervalSize, int intervalStart,
-                                          int intervalEnd,
-                                          SortedSet<Integer> processorList){
-        int numIntervals = intervalEnd - intervalStart + 1;
-
-        sumDetailData_interval_EP = new int[numIntervals][numEPs];
-        sumDetailData_PE_EP = new int[numPEs][numEPs];
-        sumDetailData_PE_interval = new int[numPEs][numIntervals];
-        double[][] tempData;
-        for(Integer curPe : processorList) {
-            int ii = intervalStart;
-            tempData = getData(curPe, TYPE_TIME);
-            for(int i=0; i<numIntervals; i++){
-                for(int e=0; e<numEPs; e++){
-                    sumDetailData_interval_EP[i][e] += (int)tempData[e][ii];
-                    sumDetailData_PE_EP[curPe][e] += (int)tempData[e][ii];
-                    sumDetailData_PE_interval[curPe][i] += (int)tempData[e][ii];
-                }
-                ii++;
-            }
-        }
 
+	public void loadSumDetailIntervalData(long intervalSize, int intervalStart, int intervalEnd,
+										  SortedSet<Integer> processorList) {
+		int numIntervals = intervalEnd - intervalStart + 1;
+
+		sumDetailData_interval_EP = new int[numIntervals][numEPs];
+		sumDetailData_PE_EP = new int[numPEs][numEPs];
+		sumDetailData_PE_interval = new int[numPEs][numIntervals];
 		systemUsageData = new int[3][processorList.size()][numIntervals];
+
 		int processorCount = 0;
 
-		for(Integer curPe : processorList) {
-			// get standard data
-			tempData = getData(curPe, TYPE_TIME, intervalSize, intervalStart,
-					intervalEnd-intervalStart+1);
-			// accumulate into systemUsageData.
-			for (int i=0; i<numIntervals; i++) {
-				for (int ep=0; ep<numEPs; ep++) {
-					systemUsageData[1][processorCount][i] +=(int)tempData[ep][i];
+		for (Integer curPe : processorList) {
+			double[][] tempData = getData(curPe, TYPE_TIME, intervalSize, intervalStart, numIntervals);
+			for (int i = 0; i < numIntervals; i++) {
+				for (int ep = 0; ep < numEPs; ep++) {
+					sumDetailData_interval_EP[i][ep] += (int) tempData[ep][i];
+					sumDetailData_PE_EP[curPe][ep] += (int) tempData[ep][i];
+					sumDetailData_PE_interval[curPe][i] += (int) tempData[ep][i];
+					systemUsageData[1][processorCount][i] += (int) tempData[ep][i];
 				}
-			// after accumulation for systemUsageData, convert to %util
-				systemUsageData[1][processorCount][i] =(int)IntervalUtils.timeToUtil(systemUsageData[1][processorCount][i],intervalSize);
+				// after accumulation for systemUsageData, convert to utilization percentage (0-100)
+				systemUsageData[1][processorCount][i] =
+						(int) IntervalUtils.timeToUtil(systemUsageData[1][processorCount][i], intervalSize);
 			}
 			processorCount++;
 		}
-    }
+	}
+
 	public int[][] getSumDetailData_interval_EP() {
 		return sumDetailData_interval_EP;
 	}