Allow SumDetail logs to be used in Extrema Analysis (#130)

Co-authored-by: dhruvr4 <[email protected]>
Co-authored-by: Ronak Buch <[email protected]>

Author: 3 people

src/projections/Tools/Extrema/ExtremaWindow.java

@@ -305,38 +305,62 @@ private void constructToolData(final  long startTime, final long endTime ) {
 		int numPEs = selectedPEs.size();
 		tempData = new double[numPEs][];
 
-		// Create a list of worker threads
-		LinkedList<Runnable> readyReaders = new LinkedList<Runnable>();
+		if (MainWindow.runObject[myRun].hasLogData()) {
+			// Create a list of worker threads
+			LinkedList<Runnable> readyReaders = new LinkedList<Runnable>();
 
-		int pIdx=0;		
-		
-		for(Integer pe : selectedPEs){
-			readyReaders.add( new ThreadedFileReader(pe, startTime, endTime, 
-					numActivities, numActivityPlusSpecial, selectedActivity, selectedAttribute) );
-			pIdx++;
-		}
-
-
-		// Determine a component to show the progress bar with
-		Component guiRootForProgressBar = null;
-		if(thisWindow!=null && thisWindow.isVisible()) {
-			guiRootForProgressBar = thisWindow;
-		} else if(MainWindow.runObject[myRun].guiRoot!=null && MainWindow.runObject[myRun].guiRoot.isVisible()){
-			guiRootForProgressBar = MainWindow.runObject[myRun].guiRoot;
-		}
+			for (Integer pe : selectedPEs) {
+				readyReaders.add(new ThreadedFileReader(pe, startTime, endTime,
+						numActivities, numActivityPlusSpecial, selectedActivity, selectedAttribute));
+			}
 
-		// Pass this list of threads to a class that manages/runs the threads nicely
-		TimedProgressThreadExecutor threadManager = new TimedProgressThreadExecutor("Loading Extrema in Parallel", readyReaders, guiRootForProgressBar, true);
-		threadManager.runAll();
+			// Determine a component to show the progress bar with
+			Component guiRootForProgressBar = null;
+			if (thisWindow != null && thisWindow.isVisible()) {
+				guiRootForProgressBar = thisWindow;
+			} else if (MainWindow.runObject[myRun].guiRoot != null && MainWindow.runObject[myRun].guiRoot.isVisible()) {
+				guiRootForProgressBar = MainWindow.runObject[myRun].guiRoot;
+			}
 
+			// Pass this list of threads to a class that manages/runs the threads nicely
+			TimedProgressThreadExecutor threadManager = new TimedProgressThreadExecutor("Loading Extrema in Parallel", readyReaders, guiRootForProgressBar, true);
+			threadManager.runAll();
+
+			// Retrieve results from each thread, storing them into tempData
+			int pIdx = 0;
+			Iterator<Runnable> iter = readyReaders.iterator();
+			while (iter.hasNext()) {
+				ThreadedFileReader r = (ThreadedFileReader) iter.next();
+				tempData[pIdx] = r.myData;
+				pIdx++;
+			}
+		} else if (MainWindow.runObject[myRun].hasSumDetailData()) {
+			int intervalSize = (int) MainWindow.runObject[myRun].getSumDetailIntervalSize();
+			int startInterval = (int) ((float) startTime / intervalSize);
+			int endInterval = (int) Math.ceil((float) endTime / intervalSize) - 1;
+
+			MainWindow.runObject[myRun].LoadGraphData(intervalSize, startInterval, endInterval, false, selectedPEs);
+
+			int[][] sumDetailData_PE_EP = MainWindow.runObject[myRun].getSumDetailData_PE_EP();
+
+			double scale = 100.0 / (endTime - startTime);
+			// Use sum files to get the idle data, sumDetail files do not contain idle data
+			double[] idleTemp = MainWindow.runObject[myRun].sumAnalyzer.getTotalIdlePercentagePerPE(startInterval, endInterval);
+
+			// Assume that each PE has the same number of EPs
+			final int numEPs = sumDetailData_PE_EP[0].length;
+			for (int pe = 0; pe < sumDetailData_PE_EP.length; pe++) {
+				double lis[] = new double[numEPs + 2];
+				double sum = 0.0;
+				for (int ep = 0; ep < numEPs; ep++) {
+					lis[ep] = sumDetailData_PE_EP[pe][ep] * scale;
+					sum += lis[ep];
+				}
 
-		// Retrieve results from each thread, storing them into tempData
-		int pIdx2=0;
-		Iterator<Runnable> iter = readyReaders.iterator();
-		while (iter.hasNext()) {
-			ThreadedFileReader r = (ThreadedFileReader) iter.next();
-			tempData[pIdx2] = r.myData;
-			pIdx2++;
+				lis[numEPs] = idleTemp[pe];
+				lis[numEPs + 1] = 100.0 - sum - lis[numEPs];
+				tempData[pe] = lis;
+			}
 		}
 
 		// Compute Extrema elements depending on attribute type.

src/projections/Tools/TimeProfile/TimeProfileWindow.java

@@ -445,7 +445,7 @@ else if( MainWindow.runObject[myRun].hasSumFiles()){
                     //Bilge
                     if( MainWindow.runObject[myRun].hasSumDetailFiles()){
                         //idle time calculation for sum detail
-                        int[] idlePercentage = MainWindow.runObject[myRun].sumAnalyzer.getTotalIdlePercentage();
+                        double[] idlePercentage = MainWindow.runObject[myRun].sumAnalyzer.getTotalIdlePercentagePerInterval();
                         for(int i=0;i<numIntervals;i++){
                             graphData[i][numEPs+1] = idlePercentage[i];
                         }

src/projections/analysis/SumAnalyzer.java

@@ -626,15 +626,36 @@ private String nextString(String description)
 	return tokenizer.sval;
     }
 
-    public int[] getTotalIdlePercentage(){
-        int[] totalIdlePercentage = new int[IntervalCount];
-        for(int i=0; i<nPe; i++){
-            for(int j=0; j<IntervalCount; j++){
-                totalIdlePercentage[j] += IdlePercentage[i][j] / IntervalCount;
-            }
-        }
-        return totalIdlePercentage;
-    }
+	public double[] getTotalIdlePercentagePerInterval() {
+		return getTotalIdlePercentagePerInterval(0, IntervalCount - 1);
+	}
+
+	public double[] getTotalIdlePercentagePerInterval(int startInterval, int endInterval) {
+		double numIntervals = endInterval - startInterval + 1;
+		double[] totalIdlePercentage = new double[(int) numIntervals];
+		for (int pe = 0; pe < nPe; pe++) {
+			for (int interval = startInterval; interval <= endInterval; interval++) {
+				totalIdlePercentage[interval - startInterval] += IdlePercentage[pe][interval] / numIntervals;
+			}
+		}
+		return totalIdlePercentage;
+	}
+
+	public double[] getTotalIdlePercentagePerPE() {
+		return getTotalIdlePercentagePerPE(0, IntervalCount - 1);
+	}
+
+	public double[] getTotalIdlePercentagePerPE(int startInterval, int endInterval) {
+		double numIntervals = endInterval - startInterval + 1;
+		double[] totalIdlePercentage = new double[nPe];
+		for (int pe = 0; pe < nPe; pe++) {
+			for (int interval = startInterval; interval <= endInterval; interval++) {
+				totalIdlePercentage[pe] += IdlePercentage[pe][interval] / numIntervals;
+			}
+		}
+		return totalIdlePercentage;
+	}
+
 	public byte[][] getIdlePercentage(){
 		return IdlePercentage;
 	}

src/projections/gui/MainMenuManager.java

@@ -165,7 +165,7 @@ private void stateChanged(int state, int sumDetail) {
 			userEventsMenuItem.setEnabled(false);
 			userStatsTimeMenuItem.setEnabled(false);
 			userStatsProcMenuItem.setEnabled(false);
-			outlierAnalysisMenuItem.setEnabled(false);
+			outlierAnalysisMenuItem.setEnabled(true);
 			multirunAnalysisMenuItem.setEnabled(true);
 			noiseMinerMenuItem.setEnabled(true);
 			memoryUsageMenuItem.setEnabled(true);