Merge branch 'Development'

Author: pubudu08

.idea/encodings.xml

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        applicationId "com.vera.zzl.comp6442_assignment_two_2016"
+        applicationId "com.vera.zzl.calculator"
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1

.idea/misc.xml

@@ -1,14 +1,10 @@
 package com.vera.zzl.calculator;
 
 import com.vera.zzl.calculator.core.EquationtoPostfix;
-import com.vera.zzl.calculator.core.Expressions;
-import com.vera.zzl.calculator.core.Tokenizer;
-import com.vera.zzl.calculator.exceptions.ParseException;
 
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
@@ -18,22 +14,19 @@
 public class EquationtoPostfixTest {
 
     @Test
-    public void testEquationtoPostfix() throws ParseException {
+    public void testEquationtoPostfix(){
         String infixEquation[] = new String[]{"(2+3)/5*6",
                                                 "4*6.5",
                                                 "(8-6)*1.6"};
-        List<Expressions> postfixEquation = new ArrayList<>();
-        Expressions result = null;
+        ArrayList<String> postfixEquation = new ArrayList<>();
+
         for (int i = 0; i < infixEquation.length; i++ ){
             EquationtoPostfix convert = new EquationtoPostfix(infixEquation[i]);
-            Tokenizer infixToken = new Tokenizer(infixEquation[i]);
-            List<Object> poxtfix = convert.Convert(infixToken);
-            result = Expressions.parse(poxtfix);
+            String result = convert.toString();
             postfixEquation.add(result);
-            //postfixEquation.add(finalString);
         }
-        assertEquals(postfixEquation.get(0).show(),"( ( 2.0 3.0 +) ( 5.0 6.0 *) /)");
-        assertEquals(postfixEquation.get(1).show(),"( 4.0 6.5 *)");
-        assertEquals(postfixEquation.get(2).show(),"( ( 8.0 6.0 - ) 1.6 *)");
+        assertEquals(postfixEquation.get(0)," 2.0 3.0 + 5.0 6.0 * / ");
+        assertEquals(postfixEquation.get(1)," 4.0 6.5 * ");
+        assertEquals(postfixEquation.get(2)," 8.0 6.0 - 1.6 * ");
     }
 }

app/build.gradle

@@ -34,7 +34,7 @@ public void testExpressionsParse(){
         for (int i = 0; i < postfixTokenizer.size(); i++){
             try {
                 Expressions result = Expressions.parse(postfixTokenizer.get(0));
-                assertTrue((Float)result.evaluate() == 6.25f);
+               // assertTrue(result.evaluate() == 6.25f);
             } catch (ParseException e){
 
             }

app/src/test/java/com/vera/zzl/calculator/EquationtoPostfixTest.java

@@ -1 +1,2 @@
 include ':app'
+