Remove logger dependency, and mutable transform methods

also use int[] instead of ArrayList, faster

Note: getPoint3D still takes the biggest chunk of time while rotating the plot in 3d

Author: babaissarkar

src/main/java/com/babai/ssplot/cli/SSPlotCLI.java

@@ -40,13 +40,14 @@ public class SSPlotCLI {
 	Plotter plt;
 
 	public SSPlotCLI() {
-		CLILogger clilogger = new CLILogger();
-		clilogger.log("Welcome to SSPlot CLI!");
+//		CLILogger clilogger = new CLILogger();
+//		clilogger.log("Welcome to SSPlot CLI!");
 
-		plt = new Plotter(clilogger);
+		System.out.println("Welcome to SSPlot CLI!");
+		plt = new Plotter();
 	}
 
-	public static void main (String[] args) {
+	public static void main(String[] args) {
 		var cli = new SSPlotCLI();
 		ArgParse.nextArg("i", args).ifPresentOrElse(
 			inputFile -> {

src/main/java/com/babai/ssplot/math/plot/Canvas.java

@@ -32,10 +32,8 @@
 import java.awt.geom.*;
 import java.awt.image.BufferedImage;
 
-import com.babai.ssplot.util.InfoLogger;
-
 public class Canvas {
-	private final static Font titleFont = new Font("Serif", Font.BOLD, 22);
+	private final static Font titleFont = new Font("Inter", Font.BOLD, 22);
 
 	private int W, H; /* Size of image */
 	private boolean axesVisible = true;
@@ -53,13 +51,10 @@ public class Canvas {
 	private String xlbl, ylbl;
 	private Project2D projector;
 
-	private InfoLogger logger;
-	
 	/*
 	 * This only sets properties of the plot
 	 * but does not start drawing. */
-	public Canvas(InfoLogger logger) {
-		this.logger = logger;
+	public Canvas() {
 		this.projector = new Project2D();
 		scaleFactor = 1.0;
 		dx = 0; dy = 0;
@@ -342,9 +337,6 @@ public void drawTitle(String title) {
 		g.setColor(titleColor);
 		drawText(title, titlePos);
 
-		Point2D.Double p2 = javaToCartesian(titlePos);
-		log(String.format("Added title \"%s\" at (%6.2f, %6.2f)", title, p2.x, p2.y));
-
 		g.setColor(prevColor);
 		g.setFont(prevFont);
 	}
@@ -379,7 +371,6 @@ public double getScaleFactor() {
 
 	public void setScaleFactor(double scaleFactor) {
 		this.scaleFactor = scaleFactor;
-		log("Zoom : " + getScaleFactor() + " x");
 	}
 
 	public boolean isAxesVisible() {
@@ -406,11 +397,6 @@ public void setAxes3d(boolean axes3d) {
 
 	public void toggleAxes() {
 		setAxesVisible(!isAxesVisible());
-		if (isAxesVisible()) {
-			log("Axes visible.");
-		} else {
-			log("Axes hidden.");
-		}
 	}
 
 	public int getPlotWidth() {
@@ -449,12 +435,20 @@ public void shift(int i, int j) {
 
 	/*********************************** Helper Methods **************************************************/
 
+	// NOTE: these mutate argument (passed point) to avoid allocating new Point2D.Double
+	
 	/* Transforms from Cartesian space to Java Graphics space. */
 	/* Takes care of scaling and translation */
 	public Point2D.Double cartesianToJava(Point2D.Double p) {
-		double x = scaleFactor*(p.x-zc.x) + zc.x;
-		double y = scaleFactor*(p.y-zc.y) + zc.y;
-		return cartesianToJavaUnscaled(x, y);
+		p.x = scaleFactor*(p.x-zc.x) + zc.x;
+		p.y = scaleFactor*(p.y-zc.y) + zc.y;
+		return cartesianToJavaUnscaled(p);
+	}
+
+	private Point2D.Double cartesianToJavaUnscaled(Point2D.Double p) {
+		p.x = p.x + dx + moveX;
+		p.y = H - (p.y + dy + moveY);
+		return p;
 	}
 
 	private Point2D.Double cartesianToJavaUnscaled(double x, double y) {
@@ -467,9 +461,9 @@ private Point2D.Double cartesianToJavaUnscaled(double x, double y) {
 	/* Takes care of scaling and translation */
 	// FIXME does not work with non Zero Zoom Center
 	public Point2D.Double javaToCartesian(Point2D.Double p1) {
-		double x = (p1.x - dx - moveX)/scaleFactor;
-		double y = ((H - p1.y) - dy - moveY)/scaleFactor;
-		return new Point2D.Double(x, y);
+		p1.x = (p1.x - dx - moveX)/scaleFactor;
+		p1.y = ((H - p1.y) - dy - moveY)/scaleFactor;
+		return p1;
 	}
 
 
@@ -481,14 +475,6 @@ public Point2D.Double polarToCartesian(double r, double theta) {
 		return p;
 	}
 
-	
-	// Utility logging method
-	private void log(String string) {
-		if (logger != null) {
-			logger.log(string + "\n");
-		}
-	}
-
 	/************************************ 3D *********************************************/
 	/**Set the projector from 3d to 2d. */
 	public void setProjection(Project2D p) {

src/main/java/com/babai/ssplot/math/plot/Plotter.java

@@ -26,27 +26,22 @@
 import java.awt.Color;
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-
-import com.babai.ssplot.util.InfoLogger;
 
 public final class Plotter {
 	private final Project2D p;
-	private final InfoLogger logger;
 	private Canvas canv;
 
 	public static final int DEFAULT_W = 450, DEFAULT_H = 450;
 
-	public Plotter(InfoLogger logger) {
-		this.logger = logger;
+	public Plotter() {
 		p = new Project2D();
 		initPlot(DEFAULT_W, DEFAULT_H);
 	}
 
 	public void initPlot(int W, int H) {
 		p.setView(0, 0, 0);
 		if (canv == null) {
-			canv = new Canvas(logger);
+			canv = new Canvas();
 		}
 		canv.initPlot(W, H);
 	}
@@ -71,9 +66,9 @@ private void plotData(PlotData pdata, int lastIndex) {
 			initPlot(DEFAULT_W, DEFAULT_H);
 		}
 
-		var dataCols = new ArrayList<Integer>();
-		for (int i = 0; i < pdata.getColumnCount(); i++) {
-			dataCols.add(pdata.getDataCol(i));
+		int[] dataCols = new int[pdata.getColumnCount()];
+		for (int i = 0;  i < dataCols.length; i++) {
+			dataCols[i] = pdata.getDataCol(i);
 		}
 
 		Point2D.Double p1 = null, p2 = null;
@@ -176,14 +171,14 @@ private void plotOthers(PlotData pdata) {
 		}
 	}
 
-	private Point2D.Double getPoint3D(double[] row, ArrayList<Integer> dataCols, Project2D projector,
+	private Point2D.Double getPoint3D(double[] row, int[] dataCols, Project2D projector,
 			int i, int j, int k)
 	{
-		return canv.cartesianToJava(projector.project(row[dataCols.get(i)], row[dataCols.get(j)], row[dataCols.get(k)]));
+		return canv.cartesianToJava(projector.project(row[dataCols[i]], row[dataCols[j]], row[dataCols[k]]));
 	}
 
-	private Point2D.Double getPoint2D(double[] row, ArrayList<Integer> dataCols, int c1, int c2) {
-		return canv.cartesianToJava(new Point2D.Double(row[dataCols.get(c1)], row[dataCols.get(c2)]));
+	private Point2D.Double getPoint2D(double[] row, int[] dataCols, int c1, int c2) {
+		return canv.cartesianToJava(new Point2D.Double(row[dataCols[c1]], row[dataCols[c2]]));
 	}
 
 	public BufferedImage getImage() {

src/main/java/com/babai/ssplot/ui/MainFrame.java

@@ -94,7 +94,7 @@ public MainFrame() {
 		logger = new StatLogger();
 		logger.log(Text.tag("h1", "Welcome to SSPlot!"));
 
-		var plt = new Plotter(logger);
+		var plt = new Plotter();
 		if (isDark) {
 			plt.setFgColor(Color.WHITE);
 			plt.setBgColor(Color.decode("#474c5b"));