Implemented expression conversion, tests now pass

4 files changed, 98 insertions, 36 deletions

diff --git a/src/main/java/sevenUnitsGUI/Presenter.java b/src/main/java/sevenUnitsGUI/Presenter.java
index be02364..57d353d 100644
--- a/src/main/java/sevenUnitsGUI/Presenter.java
+++ b/src/main/java/sevenUnitsGUI/Presenter.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.Scanner;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
 import sevenUnits.ProgramInfo;
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.BritishImperial;
+import sevenUnits.unit.LinearUnitValue;
 import sevenUnits.unit.Metric;
 import sevenUnits.unit.Unit;
 import sevenUnits.unit.UnitDatabase;
@@ -170,7 +172,7 @@ public final class Presenter {
 	/**
 	 * The database that this presenter communicates with (effectively the model)
 	 */
-	private final UnitDatabase database;
+	final UnitDatabase database;
 	
 	/**
 	 * The rule used for parsing input numbers. Any number-string inputted into
@@ -274,7 +276,58 @@ public final class Presenter {
 	 *                                       {@link ExpressionConversionView})
 	 * @since 2021-12-15
 	 */
-	public void convertExpressions() {}
+	public void convertExpressions() {
+		if (this.view instanceof ExpressionConversionView) {
+			final ExpressionConversionView xcview = (ExpressionConversionView) this.view;
+			
+			final String fromExpression = xcview.getFromExpression();
+			final String toExpression = xcview.getToExpression();
+			
+			// expressions must not be empty
+			if (fromExpression.isEmpty()) {
+				this.view.showErrorMessage("Parse Error",
+						"Please enter a unit expression in the From: box.");
+				return;
+			}
+			if (toExpression.isEmpty()) {
+				this.view.showErrorMessage("Parse Error",
+						"Please enter a unit expression in the To: box.");
+				return;
+			}
+			
+			// evaluate expressions
+			final LinearUnitValue from;
+			final Unit to;
+			try {
+				from = this.database.evaluateUnitExpression(fromExpression);
+			} catch (final IllegalArgumentException | NoSuchElementException e) {
+				this.view.showErrorMessage("Parse Error",
+						"Could not recognize text in From entry: " + e.getMessage());
+				return;
+			}
+			try {
+				to = this.database.getUnitFromExpression(toExpression);
+			} catch (final IllegalArgumentException | NoSuchElementException e) {
+				this.view.showErrorMessage("Parse Error",
+						"Could not recognize text in To entry: " + e.getMessage());
+				return;
+			}
+			
+			// convert and show output
+			if (from.getUnit().canConvertTo(to)) {
+				final double value = from.asUnitValue().convertTo(to).getValue();
+				xcview.showExpressionConversionOutput(fromExpression, toExpression,
+						value);
+			} else {
+				this.view.showErrorMessage("Conversion Error",
+						"Cannot convert between \"" + fromExpression + "\" and \""
+								+ toExpression + "\".");
+			}
+			
+		} else
+			throw new UnsupportedOperationException(
+					"This function can only be called when the view is an ExpressionConversionView");
+	}
 	
 	/**
 	 * Converts from the view's input unit to its output unit. Displays an error
@@ -326,8 +379,7 @@ public final class Presenter {
 			// convert!
 			final UnitValue initialValue = UnitValue.of(fromUnit, value);
 			final UnitValue converted = initialValue.convertTo(toUnit);
-			ucview.showUnitConversionOutput(
-					String.format("%s = %s", initialValue, converted));
+			ucview.showUnitConversionOutput(initialValue, converted);
 		} else
 			throw new UnsupportedOperationException(
 					"This function can only be called when the view is a UnitConversionView.");
@@ -365,23 +417,6 @@ public final class Presenter {
 	 */
 	public void saveSettings() {}
 	
-	/**
-	 * Returns true if and only if the unit represented by {@code unitName} has
-	 * the dimension represented by {@code dimensionName}.
-	 * 
-	 * @param unitName      name of unit to test
-	 * @param dimensionName name of dimension to test
-	 * @return whether unit has dimenision
-	 * @since 2019-04-13
-	 * @since v0.2.0
-	 */
-	boolean unitMatchesDimension(String unitName, String dimensionName) {
-		final Unit unit = this.database.getUnit(unitName);
-		final ObjectProduct<BaseDimension> dimension = this.database
-				.getDimension(dimensionName);
-		return unit.getDimension().equals(dimension);
-	}
-	
 	void unitNameSelected() {}
 	
 	/**
diff --git a/src/main/java/sevenUnitsGUI/TabbedView.java b/src/main/java/sevenUnitsGUI/TabbedView.java
index c3a05e2..1d40087 100644
--- a/src/main/java/sevenUnitsGUI/TabbedView.java
+++ b/src/main/java/sevenUnitsGUI/TabbedView.java
@@ -23,6 +23,7 @@ import java.awt.GridLayout;
 import java.awt.event.KeyEvent;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.AbstractSet;
 import java.util.Collections;
 import java.util.Iterator;
@@ -59,6 +60,7 @@ import sevenUnits.ProgramInfo;
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Unit;
 import sevenUnits.unit.UnitPrefix;
+import sevenUnits.unit.UnitValue;
 import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
@@ -140,7 +142,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	/** The combo box that selects dimensions */
 	private final JComboBox<NamedObjectProduct<BaseDimension>> dimensionSelector;
 	/** The panel for inputting values in the dimension-based converter */
-	private final JTextField valueInput;
+	private final JFormattedTextField valueInput;
 	/** The panel for "From" in the dimension-based converter */
 	private final SearchBoxList<Unit> fromSearch;
 	/** The panel for "To" in the dimension-based converter */
@@ -543,12 +545,13 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	
 	@Override
 	public OptionalDouble getInputValue() {
-		final String text = this.valueInput.getText();
 		try {
-			return OptionalDouble.of(Double.parseDouble(text));
-		} catch (final NumberFormatException e) {
+			this.valueInput.commitEdit();
+		} catch (final ParseException e) {
 			return OptionalDouble.empty();
 		}
+		return OptionalDouble
+				.of(((Number) this.valueInput.getValue()).doubleValue());
 	}
 	
 	@Override
@@ -604,8 +607,8 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	}
 	
 	@Override
-	public void showUnitConversionOutput(String outputString) {
-		this.unitOutput.setText(outputString);
+	public void showUnitConversionOutput(UnitValue input, UnitValue output) {
+		this.unitOutput.setText(input + " = " + output);
 	}
 	
 }
diff --git a/src/main/java/sevenUnitsGUI/UnitConversionView.java b/src/main/java/sevenUnitsGUI/UnitConversionView.java
index e411a44..67d3ddc 100644
--- a/src/main/java/sevenUnitsGUI/UnitConversionView.java
+++ b/src/main/java/sevenUnitsGUI/UnitConversionView.java
@@ -22,6 +22,7 @@ import java.util.Set;
 
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitValue;
 import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
@@ -94,8 +95,9 @@ public interface UnitConversionView extends View {
 	/**
 	 * Shows the output of a unit conversion.
 	 * 
-	 * @param outputString string that shows output of conversion
+	 * @param input  input unit & value (obtained from this view)
+	 * @param output output unit & value
 	 * @since 2021-12-24
 	 */
-	void showUnitConversionOutput(String outputString);
+	void showUnitConversionOutput(UnitValue input, UnitValue output);
 }
diff --git a/src/main/java/sevenUnitsGUI/ViewBot.java b/src/main/java/sevenUnitsGUI/ViewBot.java
index bc5302b..43d73bb 100644
--- a/src/main/java/sevenUnitsGUI/ViewBot.java
+++ b/src/main/java/sevenUnitsGUI/ViewBot.java
@@ -16,6 +16,7 @@
  */
 package sevenUnitsGUI;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -25,6 +26,7 @@ import java.util.Set;
 
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitValue;
 import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
@@ -59,8 +61,12 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	private Set<? extends Unit> fromUnits;
 	/** The units available in the To selection */
 	private Set<? extends Unit> toUnits;
+	/** Saved input values of all unit conversions */
+	private final List<UnitValue> unitConversionInputValues;
 	/** Saved output values of all unit conversions */
-	private List<String> unitConversionOutputValues;
+	private final List<UnitValue> unitConversionOutputValues;
+	/** Saved outputs of all unit expressions */
+	private final List<String> expressionConversionOutputs;
 	
 	/**
 	 * Creates a new {@code ViewBot} with a new presenter.
@@ -69,6 +75,10 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	 */
 	public ViewBot() {
 		this.presenter = new Presenter(this);
+		
+		this.unitConversionInputValues = new ArrayList<>();
+		this.unitConversionOutputValues = new ArrayList<>();
+		this.expressionConversionOutputs = new ArrayList<>();
 	}
 	
 	/**
@@ -81,7 +91,7 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	}
 	
 	public List<String> getExpressionConversionOutputs() {
-		throw new UnsupportedOperationException("Not implemented yet");
+		return this.expressionConversionOutputs;
 	}
 	
 	@Override
@@ -139,10 +149,18 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	}
 	
 	/**
+	 * @return the unitConversionInputValues
+	 * @since 2022-02-26
+	 */
+	public List<UnitValue> getUnitConversionInputValues() {
+		return this.unitConversionInputValues;
+	}
+	
+	/**
 	 * @return the unitConversionOutputValues
 	 * @since 2022-02-10
 	 */
-	public List<String> getUnitConversionOutputValues() {
+	public List<UnitValue> getUnitConversionOutputValues() {
 		return this.unitConversionOutputValues;
 	}
 	
@@ -247,13 +265,17 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	@Override
 	public void showExpressionConversionOutput(String fromExpression,
 			String toExpression, double value) {
-		System.out.printf("Expression Conversion: %s = %d * (%s)%n",
-				fromExpression, value, toExpression);
+		final String output = String.format("%s = %s %s", fromExpression, value,
+				toExpression);
+		this.expressionConversionOutputs.add(output);
+		System.out.println("Expression Conversion: " + output);
 	}
 	
 	@Override
-	public void showUnitConversionOutput(String outputString) {
-		System.out.println("Unit conversion: " + outputString);
+	public void showUnitConversionOutput(UnitValue input, UnitValue output) {
+		this.unitConversionInputValues.add(input);
+		this.unitConversionOutputValues.add(output);
+		System.out.println("Unit conversion: " + input + " = " + output);
 	}
 	
 	@Override