Merge branch 'master' of roympanju_1/ZCW-MacroLabs-OOP-ScientificCalculator into master

Calculator.java

@@ -1,62 +0,0 @@
- 
-
-/**
- * Created by leon on 2/9/18.
- */
-import java.util.*;
-
-public class Calculator {
-    private int x;
-    CoreFunctions coreOperator = new coreFunction();
-
-    public Operations {
-        while (true) {
-            
-        Scanner input = new Scanner(System.ln);
-        System.out.result*"Enter a command: ");
-        Double command = 0.0;
-        
-        Scanner input = new Scanner(System.in);
-        
-        Math math = new Math();
-        
-        double number1 = 0;       
-        double number2 = 0;
-        char operator;
-        double answer = 0.0;
-        boolean answer = false;
-        
-        while(done == false) {
-              System.out.println('0');  
-            }
-            
-        double number1 = input.nextDouble();
-        double number2= input.nextDouble();
-        String[] operators = new String[] { "+","-","*","/","=" };
-        
-        switch(operator) {
-            case '+': 
-            Math.add(number1 + number2);
-            break;
-            case '-':
-            Math.subtract(1 - number2);
-            break;
-            case '*':
-            Math.multiply(number1 * number2);
-            break;
-        
-            case '/':
-         if (number2 == 0) {
-             System.out.println("Err");
-         } else {
-             System.out.println(number1 / number2);}
-         }
-        System.out.println(answer()); 
-    }
-}
-    
-
-
-
-
-

Console.java

@@ -1,11 +1,14 @@
- 
+
+
+import java.util.Scanner;
 
 import java.util.*;
 
+
 /**
  * Created by leon on 2/9/18.
  */
-public class Console extends Display {
+public class Console extends DiplayMode {
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
@@ -15,6 +18,10 @@ public class Console extends Display {
         print(output + "\n", args);
     }
 
+    public static void printResult(Double result) {
+        System.out.println("Result = " + result);
+    }
+
     public static String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
@@ -23,12 +30,18 @@ public class Console extends Display {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner_1 = new Scanner(System.in);
+        println(prompt);
+        Integer firstNumber = scanner_1.nextInt();
+        return firstNumber;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        Double userInput = scanner.nextDouble();
+        return userInput;
     }
-    add double(x + y)
-    return (x + y);
+
+
 }

ConsoleTest.java

@@ -1,46 +0,0 @@
-
-
-import static org.junit.Assert.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * The test class ConsoleTest.
- *
- * @author  (your name)
- * @version (a version number or a date)
- */
-public class ConsoleTest
-{
-    private Console Display;
-    private Console doubleEntered;
-
-    /**
-     * Default constructor for test class ConsoleTest
-     */
-    public ConsoleTest()
-    {
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
-    @Before
-    public void setUp()
-    {
-        Display = new Console();
-    }
-
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
-    }
-}

CoreFunctions.java

@@ -1,75 +0,0 @@
-import java.math.*;
-import java.lang.*;
-import java.util.*;
-/**
- * Write a description of class CoreFunctions here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class CoreFunctions extends Console {
-    //** instance variables - replace the example below with your own
-    
-    private double x = 0;
-    private double y = 0;
-    private char operator;
-    boolean answer = false;
-    
-    
-    public static void main(String[] args)
-    {
- 
-    
-    /**
-     * Constructor for objects of class CoreFunctions
-     */
-    
-    
-   //** initialise instance variables
-        
-    
-
-    /**
-     * An example of a method - replace this comment with your own
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the sum of x and y
-     */
-    
-    switch (operators)
-    {
-        case '+':
-         Math.add(double x + double y);
-         return ;
-        case '-':
-        Math.subtract(double x - double y);
-        break;
-        case '*':
-        Math.multiply(double x * double y);
-        break;
-        case '/':
-        
-        Math.divide(double(x / y);  
-    } 
-    public double baseValue();
-    {
-        double baseValue = super.getTotal();
-        return baseValue + bonus;
-        
-        
-    double x = 0;
-    while(
-    
-    if (str.length() == 0) 
-    {
-        System.out.println("0");
-        else if(n == 3){
-            System.out.println("NaN"); 
-    
-         
-        GetTotal getSum = new GetTotal();
-        System.out.println(GetTotal); 
-        return ;
-    }
-}
-

CoreFunctionsCo.java

@@ -1,52 +0,0 @@
-
-/**
- * Write a description of class CoreFunctionsCo here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class CoreFunctionsCo
-{
-    // instance variables - replace the example below with your own
-private int x;
-
-/**
-     * Constructor for objects of class CoreFunctionsCo
-     */
-    public CoreFunctionsCo()
-    {
-        // initialise instance variables
-        x = 0;
-    }
-    /**
-     * An example of a method - replace this comment with your own
-     *
-     * @param  y  a sample parameter for a method
-     * @return    the sum of x and y
-     */
-    public static void runCommand() 
-    {
-    Scanner input = new Scanner(System.in);
-    Double result = 0.0;
-       coreFunctions Corefunctions = newCoreFunctions();
-       if (operator == "+") {
-        String input = input.next();
-        char grade;
-       
-        if (testscore >= 90) 
-        {
-         return x - 'A';
-        }
-    else if (double multiply(x * y)
-    {
-        return x * 'y';
-    }
-    else if (testscore >= 70) 
-    {
-        return x / 'y';
-    }
-    else public double squareRoot(double x) 
-    {
-    return Math.sqrt(x); 
-    }
-}

CoreFunctionsCoTest.java

@@ -1,42 +0,0 @@
-
-
-import static org.junit.Assert.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * The test class CoreFunctionsCoTest.
- *
- * @author  (your name)
- * @version (a version number or a date)
- */
-public class CoreFunctionsCoTest
-{
-    /**
-     * Default constructor for test class CoreFunctionsCoTest
-     */
-    public CoreFunctionsCoTest()
-    {
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
-    @Before
-    public void setUp()
-    {
-    }
-
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
-    }
-}

CoreFunctionsTest.java

@@ -1,42 +0,0 @@
-
-
-import static org.junit.Assert.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * The test class CoreFunctionsTest.
- *
- * @author  (your name)
- * @version (a version number or a date)
- */
-public class CoreFunctionsTest
-{
-    /**
-     * Default constructor for test class CoreFunctionsTest
-     */
-    public CoreFunctionsTest()
-    {
-    }
-
-    /**
-     * Sets up the test fixture.
-     *
-     * Called before every test case method.
-     */
-    @Before
-    public void setUp()
-    {
-    }
-
-    /**
-     * Tears down the test fixture.
-     *
-     * Called after every test case method.
-     */
-    @After
-    public void tearDown()
-    {
-    }
-}

DiplayMode.java

@@ -0,0 +1,57 @@
+
+/**
+ * Write a description of class DiplayMode here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+import java.util.Scanner;
+public class DiplayMode
+{
+
+    private String currentMode = "decimal";
+    private double userInput;
+
+    public void setResult(double result){
+        userInput = result;
+    }
+    
+    public String enterMode(){
+        Console.println("Enter mode: decimal, binary, octal, hexadecimal");
+        Scanner scanner = new Scanner(System.in);
+        String modeInput = scanner.nextLine();
+        return modeInput;
+        
+    }
+
+    public void switchDisplayMode(String mode){
+        this.currentMode = mode;
+        String value = convertNumber(this.currentMode);
+        System.out.println(value);
+    }
+
+    public void switchDisplayMode()
+    {  
+        String[] modes = {"decimal", "binary", "octal", "hexadecimal"};
+        currentMode = modes[0];
+        String value = convertNumber(currentMode);
+        System.out.println(value);
+
+    }
+
+    public String convertNumber(String command){
+        String value = "";
+        if (command.equalsIgnoreCase("decimal")){
+            value = Double.toString(userInput);
+        } else if (command.equalsIgnoreCase("binary")){
+            value = Integer.toBinaryString((int)userInput);
+        } else if (command.equalsIgnoreCase("octal")){
+            value = Integer.toOctalString((int)userInput);
+        } else if (command.equalsIgnoreCase("hexadecimal")){
+            value = Double.toHexString(userInput);
+        }
+        return value;
+    }
+
+}
+

MainApplication.java

@@ -0,0 +1,15 @@
+
+/**
+ * Created by Roy Mpanju on 5/29/18.
+ */
+public class MainApplication {
+    //Operations Operations = new Operations();
+    public static void main(String[] args) {
+
+        Console.println("Welcome to my calculator!");
+        Console.println("for HELP press ?");
+        Operations.runCommand();
+
+    }
+
+}

Memory.java

@@ -0,0 +1,34 @@
+
+/**
+ * Write a description of class Memory here.
+ *
+ * @author (Roy Mpanju)
+ * @version (a version number or a date)
+ */
+public class Memory extends Operations
+{
+    Double numberInMemory = 0.0;
+    
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    public Double storeInMemory(Double currentDisplay)
+    {
+        // put your code here
+        numberInMemory = currentDisplay;
+        return numberInMemory;
+    }
+    
+    public Double clearMemory(){
+        return numberInMemory = 0.0;
+    }
+    
+    public Double retrieveFromMemory(){
+        return numberInMemory;
+    }
+    
+    //public String 
+}

Operations.java

@@ -0,0 +1,144 @@
+
+/**
+ * Write a description of class Operations here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+import java.util.Scanner;
+public class Operations
+{
+    /**
+     * prompting a user for a command solving for that command
+     * 
+     */
+    public static void printHelp(){
+        System.out.println("\n? | + | - | * | / |");
+        System.out.println("^ | sqrt | exp | inverse |");
+        System.out.println("cos | sine | tan | cos-1 | sin-1 | m+ | m- | MRC");
+        System.out.println("log | ln | ex |");
+        System.out.println("to clear display enter clrDisplay\n");
+    }
+
+    public static Double runCommand()
+    {
+        // put your code here
+
+        Scanner input = new Scanner(System.in);
+        Double result = 0.0;
+        //String userInput = scanner.nextLine();
+        scienticFunctions ScientificFunctions = new scienticFunctions();
+        Memory memory = new Memory();
+        DiplayMode displayMode = new DiplayMode();
+        bonusFunctions bonusFunctions = new bonusFunctions();
+        // Calculator calc = new ....
+        while (true) {
+            System.out.print("Enter a command: ");
+            String command = input.next();
+            if (command.equalsIgnoreCase("exit"))  {
+                System.out.print("Thanks for calculating with us!");
+                break;
+            }
+            else if (command.equalsIgnoreCase("sine"))  {
+                if (result != 0){
+                    result = ScientificFunctions.sine(result);
+                }
+                else{
+                    result = ScientificFunctions.sine(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if (command.equalsIgnoreCase("cos"))  {
+                if (result != 0){
+                    result = ScientificFunctions.cosine(result);
+                }
+                else{
+                    result = ScientificFunctions.cosine(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if (command.equalsIgnoreCase("tan"))  {
+                if (result != 0){
+                    result = ScientificFunctions.tangent(result);
+                }
+                else{
+                    result = ScientificFunctions.tangent(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if (command.equalsIgnoreCase("cos-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseCosine(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseCosine(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if (command.equalsIgnoreCase("sin-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseSine(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseSine(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if (command.equalsIgnoreCase("tan-1"))  {
+                if (result != 0){
+                    result = ScientificFunctions.inverseTangent(result);
+                }
+                else{
+                    result = ScientificFunctions.inverseTangent(Console.getDoubleInput("Enter number"));
+                }
+                Console.printResult(result);
+            }
+            else if(command.equalsIgnoreCase("M+")){
+                memory.storeInMemory(result);
+                Console.printResult(result);
+            }
+
+            else if (command.equalsIgnoreCase("M-")){
+                Console.printResult(memory.clearMemory());
+            }
+
+            else if (command.equalsIgnoreCase("MRC")){
+                Console.printResult(memory.retrieveFromMemory());
+            }
+
+            else if (command.equalsIgnoreCase("switchmode")){
+                displayMode.setResult(result);
+                String mode = displayMode.enterMode();
+                //System.out.println(mode);
+                displayMode.switchDisplayMode(mode);
+
+            }
+            else if (command.equalsIgnoreCase("log")){
+                Console.printResult(bonusFunctions.LogBaseTenOfAnumber(result));
+            }
+            else if (command.equalsIgnoreCase("ln")){
+                Console.printResult(bonusFunctions.naturalLogLn(result));
+            }
+            else if (command.equalsIgnoreCase("ex")){
+                Console.printResult(bonusFunctions.exponential(result));
+            }
+            else if(command.equalsIgnoreCase("?")){
+                printHelp();
+            }
+            else if(command.equalsIgnoreCase("clrDisplay")){
+                result = 0.0;
+            }
+            else{
+                Console.println("Invalid command please press ? for help");
+            }
+            //firstNumber = result;
+            // and on and on
+        }
+        return result;
+
+    }
+
+    //Add CommentCollapse 
+
+}
+

bonusFunctions.java

@@ -0,0 +1,33 @@
+
+/**
+ * Write a description of class bonusFunctions here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class bonusFunctions
+{
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    public Double naturalLogLn(Double x)
+    {
+        // put your code here
+        return Math.log(x);
+    }
+    
+    public Double LogBaseTenOfAnumber(Double x)
+    {
+        // put your code here
+        return Math.log10(x);
+    }
+    
+    public Double exponential(Double x)
+    {
+        // put your code here
+        return Math.exp(x);
+    }
+}

bonusFunctionsTest.java

@@ -0,0 +1,58 @@
+
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class bonusFunctionsTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class bonusFunctionsTest
+{
+    private bonusFunctions bonusFunctions;
+    @Before
+    public void setUp(){
+        bonusFunctions = new bonusFunctions();
+    }
+
+    @Test
+    public void naturalLogLnTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = bonusFunctions.naturalLogLn(1.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void LogBaseTenOfAnumberTest(){
+        // :Given
+        Double expected = 1.0;
+
+        // :When
+        Double actual = bonusFunctions.LogBaseTenOfAnumber(10.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void exponentialTest(){
+        // :Given
+        Double expected = 2.7182818285;
+
+        // :When
+        Double actual = bonusFunctions.exponential(1.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+}

Display.java → calculatorCoreFunctions.java

@@ -1,22 +1,24 @@
 
 /**
- * Write a description of class Display here.
+ * Write a description of class calculatorCoreFunctions here.
  *
  * @author (your name)
  * @version (a version number or a date)
  */
-public class Display
+public class calculatorCoreFunctions
 {
     // instance variables - replace the example below with your own
     private int x;
+    
 
     /**
-     * Constructor for objects of class Display
+     * Constructor for objects of class calculatorCoreFunctions
      */
-    public Display()
+    public calculatorCoreFunctions()
     {
         // initialise instance variables
-        x = 0;
+        x = 5;
+        //y= 0;
     }
 
     /**
@@ -25,7 +27,7 @@ public class Display
      * @param  y  a sample parameter for a method
      * @return    the sum of x and y
      */
-    public int sampleMethod(int y)
+    public int add(int y)
     {
         // put your code here
         return x + y;

doc/allclasses-frame.html

@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>All Classes</title>
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="scienticFunctions.html" title="class in &lt;Unnamed&gt;" target="classFrame">scienticFunctions</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/allclasses-noframe.html

@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>All Classes</title>
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="scienticFunctions.html" title="class in &lt;Unnamed&gt;">scienticFunctions</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/constant-values.html

@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Constant Field Values</title>
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+</body>
+</html>

doc/index.html

@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Generated Documentation (Untitled)</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="scienticFunctions.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="scienticFunctions.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>

doc/logfile.txt

@@ -0,0 +1,37 @@
+Class documentation
+<---- javadoc command: ---->
+/Applications/BlueJ.app/Contents/JDK/Home/bin/javadoc
+-author
+-version
+-nodeprecated
+-package
+-Xdoclint:none
+-noindex
+-notree
+-nohelp
+-nonavbar
+-source
+1.8
+-classpath
+/Applications/BlueJ.app/Contents/Resources/Java/bluejcore.jar:/Applications/BlueJ.app/Contents/Resources/Java/junit-4.11.jar:/Applications/BlueJ.app/Contents/Resources/Java/hamcrest-core-1.3.jar:/Applications/BlueJ.app/Contents/Resources/Java/lang-stride.jar:/Applications/BlueJ.app/Contents/Resources/Java/userlib/pi4j-core.jar:/Applications/BlueJ.app/Contents/Resources/Java/userlib/pi4j-gpio-extension.jar:/Applications/BlueJ.app/Contents/Resources/Java/userlib/pi4j-service.jar:/Applications/BlueJ.app/Contents/Resources/Java/userlib/pi4j-device.jar:/Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator
+-d
+/Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc
+-encoding
+UTF-8
+-charset
+UTF-8
+/Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/scienticFunctions.java
+<---- end of javadoc command ---->
+Loading source file /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/scienticFunctions.java...
+Constructing Javadoc information...
+Standard Doclet version 1.8.0_144
+Building tree for all the packages and classes...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/scienticFunctions.html...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/package-frame.html...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/package-summary.html...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/constant-values.html...
+Building index for all the packages and classes...
+Building index for all classes...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/allclasses-frame.html...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/allclasses-noframe.html...
+Generating /Users/roym/firstLab/ZCW-MacroLabs-OOP-ScientificCalculator/doc/index.html...

doc/package-frame.html

@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>&lt;Unnamed&gt;</title>
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="package-summary.html" target="classFrame">&lt;Unnamed&gt;</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="scienticFunctions.html" title="class in &lt;Unnamed&gt;" target="classFrame">scienticFunctions</a></li>
+</ul>
+</div>
+</body>
+</html>

doc/package-list

@@ -0,0 +1 @@
+

doc/package-summary.html

@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;&lt;Unnamed&gt;</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="scienticFunctions.html" title="class in &lt;Unnamed&gt;">scienticFunctions</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</body>
+</html>

doc/scienticFunctions.html

@@ -0,0 +1,178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_144) on Sat May 26 10:54:11 EDT 2018 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>scienticFunctions</title>
+<meta name="date" content="2018-05-26">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="scienticFunctions";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<h2 title="Class scienticFunctions" class="title">Class scienticFunctions</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>scienticFunctions</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">scienticFunctions</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="scienticFunctions.html#scienticFunctions--">scienticFunctions</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="scienticFunctions.html#cosine-double-">cosine</a></span>(double&nbsp;y)</code>
+<div class="block">A method - find the cosine of a given number</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="scienticFunctions.html#sine-double-">sine</a></span>(double&nbsp;y)</code>
+<div class="block">A method - find the sine of a given number by converting it to radians</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="scienticFunctions--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scienticFunctions</h4>
+<pre>public&nbsp;scienticFunctions()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="cosine-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cosine</h4>
+<pre>public static&nbsp;double&nbsp;cosine(double&nbsp;y)</pre>
+<div class="block">A method - find the cosine of a given number</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>y</code> - a sample parameter for a method</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the cosine of y</dd>
+</dl>
+</li>
+</ul>
+<a name="sine-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>sine</h4>
+<pre>public&nbsp;double&nbsp;sine(double&nbsp;y)</pre>
+<div class="block">A method - find the sine of a given number by converting it to radians</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>y</code> - a sample parameter for a method</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the sine of y</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>

doc/script.js

@@ -0,0 +1,30 @@
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}

doc/stylesheet.css

@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}

package.bluej

@@ -1,23 +1,59 @@
 #BlueJ package file
-dependency1.from=MainApplication
-dependency1.to=Console
+dependency1.from=bonusFunctionsTest
+dependency1.to=bonusFunctions
 dependency1.type=UsesDependency
-editor.fx.0.height=722
+dependency10.from=Operations
+dependency10.to=Console
+dependency10.type=UsesDependency
+dependency11.from=ConsoleTest
+dependency11.to=Console
+dependency11.type=UsesDependency
+dependency12.from=MainApplication
+dependency12.to=Console
+dependency12.type=UsesDependency
+dependency13.from=MainApplication
+dependency13.to=Operations
+dependency13.type=UsesDependency
+dependency2.from=scienticFunctionsTest
+dependency2.to=scienticFunctions
+dependency2.type=UsesDependency
+dependency3.from=DiplayMode
+dependency3.to=Console
+dependency3.type=UsesDependency
+dependency4.from=Calculator
+dependency4.to=CoreFunctions
+dependency4.type=UsesDependency
+dependency5.from=Calculator
+dependency5.to=Operations
+dependency5.type=UsesDependency
+dependency6.from=Operations
+dependency6.to=scienticFunctions
+dependency6.type=UsesDependency
+dependency7.from=Operations
+dependency7.to=Memory
+dependency7.type=UsesDependency
+dependency8.from=Operations
+dependency8.to=DiplayMode
+dependency8.type=UsesDependency
+dependency9.from=Operations
+dependency9.to=bonusFunctions
+dependency9.type=UsesDependency
+editor.fx.0.height=717
 editor.fx.0.width=800
-editor.fx.0.x=640
+editor.fx.0.x=371
 editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
-package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
+objectbench.height=200
+objectbench.width=552
+package.divider.horizontal=0.6004296455424275
+package.divider.vertical=0.6854103343465046
+package.editor.height=444
+package.editor.width=825
 package.editor.x=35
-package.editor.y=60
-package.frame.height=759
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.editor.y=23
+package.frame.height=716
+package.frame.width=951
+package.numDependencies=13
+package.numTargets=17
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +63,123 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=CoreFunctionsCo
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=130
+target1.x=10
+target1.y=120
+target10.height=50
+target10.name=CoreFunctionsTest
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=140
+target10.x=10
+target10.y=240
+target11.height=50
+target11.name=Calculator
+target11.showInterface=false
+target11.type=ClassTarget
+target11.width=90
+target11.x=160
+target11.y=260
+target12.height=50
+target12.name=Console
+target12.showInterface=false
+target12.type=ClassTarget
+target12.width=80
+target12.x=240
+target12.y=200
+target13.association=bonusFunctionsTest
+target13.height=50
+target13.name=bonusFunctions
+target13.showInterface=false
+target13.type=ClassTarget
+target13.width=120
+target13.x=500
+target13.y=330
+target14.height=50
+target14.name=Operations
+target14.showInterface=false
+target14.type=ClassTarget
+target14.width=90
+target14.x=380
+target14.y=370
+target15.height=50
+target15.name=ConsoleTest
+target15.showInterface=false
+target15.type=ClassTarget
+target15.width=100
+target15.x=10
+target15.y=300
+target16.height=50
+target16.name=MainApplication
+target16.showInterface=false
+target16.type=ClassTarget
+target16.width=120
+target16.x=140
+target16.y=60
+target17.height=50
+target17.name=Display
+target17.showInterface=false
+target17.type=ClassTarget
+target17.width=80
+target17.x=160
+target17.y=320
 target2.height=50
-target2.name=MainApplication
+target2.name=CoreFunctionsCoTest
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=160
+target2.x=10
+target2.y=180
+target3.height=50
+target3.name=Memory
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=640
+target3.y=370
+target4.height=50
+target4.name=bonusFunctionsTest
+target4.showInterface=false
+target4.type=UnitTestTargetJunit4
+target4.width=120
+target4.x=530
+target4.y=300
+target5.association=scienticFunctionsTest
+target5.height=50
+target5.name=scienticFunctions
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=130
+target5.x=500
+target5.y=230
+target6.height=50
+target6.name=scienticFunctionsTest
+target6.showInterface=false
+target6.type=UnitTestTargetJunit4
+target6.width=130
+target6.x=530
+target6.y=200
+target7.height=50
+target7.name=calculatorCoreFunctions
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=180
+target7.x=460
+target7.y=150
+target8.height=50
+target8.name=CoreFunctions
+target8.showInterface=false
+target8.type=ClassTarget
+target8.width=120
+target8.x=150
+target8.y=120
+target9.height=50
+target9.name=DiplayMode
+target9.showInterface=false
+target9.type=ClassTarget
+target9.width=100
+target9.x=50
+target9.y=360

scienticFunctions.java

@@ -0,0 +1,41 @@
+
+/**
+ * Write a description of class scienticFunctions here.
+ *
+ * @author (Roy Mpanju)
+ * @version (a version number or a date)
+ */
+
+import java.lang.*;
+public class scienticFunctions
+{
+    /**
+     * A method - find solve for the trignometry functions of a given number by converting it to radians
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sine of y
+     */
+    public static double sine(double y){
+        return Math.sin(Math.toRadians(y));
+    }
+    
+    public static double cosine(double y){
+        return Math.cos(Math.toRadians(y));
+    }
+
+    public double tangent(double y){
+        return Math.tan(Math.toRadians(y));
+    }
+
+    public double inverseCosine(double y){
+        return Math.acos(y) * 180/Math.PI;
+    }
+
+    public double inverseSine(double y){
+        return (Math.asin(y))* 180/Math.PI;
+    }
+
+    public double inverseTangent(double y){
+        return (Math.atan(y))*180/Math.PI;
+    }
+}

scienticFunctionsTest.java

@@ -0,0 +1,94 @@
+
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class scienticFunctionsTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class scienticFunctionsTest
+{
+    private scienticFunctions scientificFunctions;
+    
+    @Before
+    public void setUp(){
+        scientificFunctions = new scienticFunctions();
+    }
+
+    @Test
+    public void sineTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.sine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void cosineTest(){
+        // :Given
+        Double expected = 1.0;
+
+        // :When
+        Double actual = scientificFunctions.cosine(0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void tangentTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.tangent(0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseTangentTest(){
+        // :Given
+        Double expected = 45.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseTangent(1);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseCosineTest(){
+        // :Given
+        Double expected = 90.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseCosine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+    
+    @Test
+    public void inverseSineTest(){
+        // :Given
+        Double expected = 0.0;
+
+        // :When
+        Double actual = scientificFunctions.inverseSine(0.0);
+
+        // :Then
+        Assert.assertEquals(expected, actual);
+    }
+}