Skip to content

Stats config #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gaming32 merged 17 commits into from
Dec 31, 2021
Merged

Stats config #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f31bac2
Create stats-config.txt
Gaming32 Dec 30, 2021
2f1c709
Implement stats-config.txt
Gaming32 Dec 30, 2021
cf89a60
Some code cleanup
Gaming32 Dec 30, 2021
56beac8
Improve error messages
Gaming32 Dec 30, 2021
1a32c6f
Add FPS statistic
Gaming32 Dec 30, 2021
ced2264
Change the font family and scale
Gaming32 Dec 30, 2021
257acbd
Fix bug
Gaming32 Dec 30, 2021
014cf78
Reposition the font too
Gaming32 Dec 30, 2021
a26ea0b
Use constants for default
Gaming32 Dec 30, 2021
a430242
Change numbers for STAT_ constants
Gaming32 Dec 30, 2021
ed3eeea
Remove comments
Gaming32 Dec 31, 2021
d22487d
Shuffle some code arround
Gaming32 Dec 31, 2021
6a51f13
Truncate FPS visual
Gaming32 Dec 31, 2021
10edae5
Make cast
Gaming32 Dec 31, 2021
49812da
use enum
EmeraldBlock Dec 31, 2021
54ec849
Rename enum
Gaming32 Dec 31, 2021
9c1d493
Merge branch 'main' into stats-config
Gaming32 Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
225 changes: 189 additions & 36 deletions src/main/ArrayVisualizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.KeyEventDispatcher;
import java.awt.KeyboardFocusManager;
import java.awt.Stroke;
import java.awt.Toolkit;
import java.awt.datatransfer.DataFlavor;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DropTarget;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.dnd.DnDConstants;
import java.awt.datatransfer.DataFlavor;
import java.awt.KeyboardFocusManager;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.InputEvent;
Expand All @@ -30,10 +30,13 @@
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Scanner;
import java.util.Properties;

import javax.swing.JFrame;
Expand All @@ -48,14 +51,35 @@
import main.SortAnalyzer.SortPair;
import panes.JErrorPane;
import threads.RunScriptedSorts;
import utils.*;
import utils.AntiQSort;
import utils.ArrayFileWriter;
import utils.Delays;
import utils.Highlights;
import utils.MultipleScript;
import utils.Reads;
import utils.Renderer;
import utils.Rotations;
import utils.Sounds;
import utils.Statistics;
import utils.Timer;
import utils.Writes;
import visuals.Visual;
import visuals.VisualStyles;
import visuals.bars.*;
import visuals.circles.*;
import visuals.dots.*;
import visuals.image.*;
import visuals.misc.*;
import visuals.bars.BarGraph;
import visuals.bars.DisparityBarGraph;
import visuals.bars.Rainbow;
import visuals.bars.SineWave;
import visuals.circles.ColorCircle;
import visuals.circles.DisparityChords;
import visuals.circles.DisparityCircle;
import visuals.circles.Spiral;
import visuals.dots.DisparityDots;
import visuals.dots.ScatterPlot;
import visuals.dots.SpiralDots;
import visuals.dots.WaveDots;
import visuals.image.CustomImage;
import visuals.misc.HoopStack;
import visuals.misc.PixelMesh;

/*
*
Expand Down Expand Up @@ -89,6 +113,40 @@ of this software and associated documentation files (the "Software"), to deal
final public class ArrayVisualizer {
private static ArrayVisualizer INSTANCE = null;

private enum StatisticType {
LINE_BREAK,
SORT_IDENTITY,
ARRAY_LENGTH,
FRAMERATE,
SORT_DELAY,
VISUAL_TIME,
EST_SORT_TIME,
COMPARISONS,
SWAPS,
REVERSALS,
MAIN_WRITE,
AUX_WRITE,
AUX_ALLOC,
SEGMENTS;

private static final Map<String, StatisticType> CONFIG_KEYS = Collections.unmodifiableMap(new HashMap<String, StatisticType>() {{
put("", LINE_BREAK);
put("sort", SORT_IDENTITY);
put("length", ARRAY_LENGTH);
put("fps", FRAMERATE);
put("delay", SORT_DELAY);
put("vtime", VISUAL_TIME);
put("stime", EST_SORT_TIME);
put("comps", COMPARISONS);
put("swaps", SWAPS);
put("revs", REVERSALS);
put("wmain", MAIN_WRITE);
put("waux", AUX_WRITE);
put("auxlen", AUX_ALLOC);
put("segments", SEGMENTS);
}});
}

final JFrame window;

final private int MIN_ARRAY_VAL;
Expand All @@ -101,6 +159,7 @@ final public class ArrayVisualizer {
final int[] stabilityTable;
final int[] indexTable;
final ArrayList<int[]> arrays;
private final StatisticType[] statsConfig;

private SortPair[] AllSorts; // First row of Comparison/DistributionSorts arrays consists of class names
private SortPair[] ComparisonSorts; // First row of Comparison/DistributionSorts arrays consists of class names
Expand Down Expand Up @@ -142,6 +201,7 @@ final public class ArrayVisualizer {

private Statistics statSnapshot;
private String fontSelection;
private int fontSelectionScale;

private volatile boolean TEXTDRAW;
private volatile boolean COLOR;
Expand Down Expand Up @@ -336,6 +396,62 @@ public void run() {
this.arrays = new ArrayList<>();
this.arrays.add(this.array);

this.fontSelection = "Times New Roman";
this.fontSelectionScale = 25;
List<StatisticType> statsInfoList = new ArrayList<>();
try (Scanner statsScanner = new Scanner(new File("stats-config.txt"))) {
while (statsScanner.hasNextLine()) {
String line = statsScanner.nextLine().trim();
if (line.length() > 0 && line.charAt(0) == '#') continue;
if (line.startsWith("FONT:")) {
String font = line.substring(5);
int starIndex;
if ((starIndex = font.indexOf('*')) != -1) {
Comment thread
EmeraldBlock marked this conversation as resolved.
fontSelectionScale = Integer.parseInt(font.substring(starIndex + 1).trim());
font = font.substring(0, starIndex);
}
fontSelection = font.trim();
continue;
}
StatisticType type = StatisticType.CONFIG_KEYS.get(line.toLowerCase());
if (type == null) {
System.err.println("Unknown statistic type: " + type);
continue;
}
statsInfoList.add(type);
}
} catch (Exception e) {
statsInfoList = null;
JErrorPane.invokeErrorMessage(e, "ArrayVisualizer");
JOptionPane.showMessageDialog(
this.window,
"Unable to load stats-config, using default config",
"ArrayVisualizer",
JOptionPane.WARNING_MESSAGE
);
}
if (statsInfoList == null) {
statsConfig = new StatisticType[] {
StatisticType.SORT_IDENTITY,
StatisticType.ARRAY_LENGTH,
StatisticType.LINE_BREAK,
StatisticType.SORT_DELAY,
StatisticType.VISUAL_TIME,
StatisticType.EST_SORT_TIME,
StatisticType.LINE_BREAK,
StatisticType.COMPARISONS,
StatisticType.SWAPS,
StatisticType.REVERSALS,
StatisticType.LINE_BREAK,
StatisticType.MAIN_WRITE,
StatisticType.AUX_WRITE,
StatisticType.AUX_ALLOC,
StatisticType.SEGMENTS
};
} else {
statsConfig = statsInfoList.toArray(new StatisticType[statsInfoList.size()]);
}

this.sortLength = Math.min(2048, this.MAX_ARRAY_VAL);
this.uniqueItems = this.sortLength;

Expand Down Expand Up @@ -397,8 +513,7 @@ public void run() {
this.category = "";
this.heading = "";
this.extraHeading = "";
this.fontSelection = "Times New Roman";
this.typeFace = new Font(this.fontSelection, Font.PLAIN, (int) (this.getWindowRatio() * 25));
this.typeFace = new Font(fontSelection, Font.PLAIN, (int) (this.getWindowRatio() * fontSelectionScale));

this.statSnapshot = new Statistics(this);

Expand Down Expand Up @@ -469,7 +584,7 @@ public void run() {
ArrayVisualizer.this.visualClasses[13] = new Spiral(ArrayVisualizer.this);
ArrayVisualizer.this.visualClasses[14] = new SpiralDots(ArrayVisualizer.this);

while(ArrayVisualizer.this.visualsEnabled) {
while (ArrayVisualizer.this.visualsEnabled) {
if (ArrayVisualizer.this.updateVisualsForced == 0) {
try {
synchronized (ArrayVisualizer.this) {
Expand All @@ -479,6 +594,7 @@ public void run() {
e.printStackTrace();
}
}
long startTime = System.currentTimeMillis();
try {
if(ArrayVisualizer.this.updateVisualsForced > 0) {
ArrayVisualizer.this.updateVisualsForced--;
Expand All @@ -498,19 +614,14 @@ public void run() {
if (ArrayVisualizer.this.updateVisualsForced > 10000) {
ArrayVisualizer.this.updateVisualsForced = 100;
}
}
catch (Exception e) {
} catch (Exception e) {
e.printStackTrace();
}
// See: https://stackoverflow.com/questions/580419/how-can-i-stop-a-java-while-loop-from-eating-50-of-my-cpu/583537#583537
try {
Thread.sleep(ArrayVisualizer.this.benchmarking ? 1000 : 0);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
ArrayVisualizer.this.visualsEnabled = false;
}
Comment thread
Gaming32 marked this conversation as resolved.

}}};
long endTime = System.currentTimeMillis();
statSnapshot.frameTimeMillis = endTime - startTime;
Comment thread
Gaming32 marked this conversation as resolved.
}
}
};

this.Sounds.startAudioThread();
this.drawWindows();
Expand Down Expand Up @@ -544,21 +655,63 @@ private void drawStats(Color textColor, boolean dropShadow) {
}

double windowRatio = this.getWindowRatio();
int yPos = (int)(fontSelectionScale / 25.0 * 30);

this.mainRender.setColor(textColor);

this.mainRender.drawString(this.statSnapshot.getSortIdentity(), xOffset, (int) (windowRatio * 30) + yOffset);
this.mainRender.drawString(this.statSnapshot.getArrayLength(), xOffset, (int) (windowRatio * 55) + yOffset);
this.mainRender.drawString(this.statSnapshot.getSortDelay(), xOffset, (int) (windowRatio * 95) + yOffset);
this.mainRender.drawString(this.statSnapshot.getVisualTime(), xOffset, (int) (windowRatio * 120) + yOffset);
this.mainRender.drawString(this.statSnapshot.getEstSortTime(), xOffset, (int) (windowRatio * 145) + yOffset);
this.mainRender.drawString(this.statSnapshot.getComparisonCount(), xOffset, (int) (windowRatio * 185) + yOffset);
this.mainRender.drawString(this.statSnapshot.getSwapCount(), xOffset, (int) (windowRatio * 210) + yOffset);
this.mainRender.drawString(this.statSnapshot.getReversalCount(), xOffset, (int) (windowRatio * 235) + yOffset);
this.mainRender.drawString(this.statSnapshot.getMainWriteCount(), xOffset, (int) (windowRatio * 275) + yOffset);
this.mainRender.drawString(this.statSnapshot.getAuxWriteCount(), xOffset, (int) (windowRatio * 300) + yOffset);
this.mainRender.drawString(this.statSnapshot.getAuxAllocAmount(), xOffset, (int) (windowRatio * 325) + yOffset);
this.mainRender.drawString(this.statSnapshot.getSegments(), xOffset, (int) (windowRatio * 355) + yOffset);
statLoop:
for (StatisticType statType : statsConfig) {
// System.out.println(yPos);
String stat;
switch (statType) {
case LINE_BREAK:
yPos += (int)(fontSelectionScale / 25.0 * 15);
continue statLoop;
case SORT_IDENTITY:
stat = statSnapshot.getSortIdentity();
break;
case ARRAY_LENGTH:
stat = statSnapshot.getArrayLength();
break;
case FRAMERATE:
stat = statSnapshot.getFramerate();
break;
case SORT_DELAY:
stat = statSnapshot.getSortDelay();
break;
case VISUAL_TIME:
stat = statSnapshot.getVisualTime();
break;
case EST_SORT_TIME:
stat = statSnapshot.getEstSortTime();
break;
case COMPARISONS:
stat = statSnapshot.getComparisonCount();
break;
case SWAPS:
stat = statSnapshot.getSwapCount();
break;
case REVERSALS:
stat = statSnapshot.getReversalCount();
break;
case MAIN_WRITE:
stat = statSnapshot.getMainWriteCount();
break;
case AUX_WRITE:
stat = statSnapshot.getAuxWriteCount();
break;
case AUX_ALLOC:
stat = statSnapshot.getAuxAllocAmount();
break;
case SEGMENTS:
stat = statSnapshot.getSegments();
break;
default:
stat = null; // Unreachable
}
mainRender.drawString(stat, xOffset, (int)(windowRatio * yPos) + yOffset);
yPos += fontSelectionScale;
}
}

public void updateNow() {
Expand Down Expand Up @@ -987,7 +1140,7 @@ public double getWindowRatio() {
return this.cw / 1280d;
}
public void updateFontSize() {
this.typeFace = new Font(this.fontSelection, Font.PLAIN, (int) (this.getWindowRatio() * 25));
this.typeFace = new Font(fontSelection, Font.PLAIN, (int) (this.getWindowRatio() * fontSelectionScale));
this.mainRender.setFont(this.typeFace);
}

Expand Down
Loading