Przeglądaj źródła

Thunderdome's Calculator

Trinh Tong 6 lat temu
rodzic
commit
5108421c02
13 zmienionych plików z 820 dodań i 15 usunięć
  1. BIN
      .DS_Store
  2. 52
    0
      Basic.java
  3. 139
    0
      BasicTest.java
  4. 32
    0
      MainMenu.java
  5. 75
    0
      MemoryFunc.java
  6. 57
    0
      RealAdvanced.java
  7. 98
    0
      RealAdvancedTest.java
  8. 19
    0
      SciCalc.java
  9. 71
    0
      SwitchDisplay.java
  10. 74
    0
      SwitchDisplayTest.java
  11. 82
    0
      Trig.java
  12. 106
    0
      TrigTest.java
  13. 15
    15
      package.bluej

BIN
.DS_Store Wyświetl plik


+ 52
- 0
Basic.java Wyświetl plik

@@ -0,0 +1,52 @@
1
+
2
+
3
+/**
4
+ * Basic class to perform basic functions for our Graphing Calculator
5
+ * (+, -, *, /)
6
+ * Lauren Green
7
+ * 10/19/18
8
+ */
9
+public class Basic
10
+{
11
+    double input1 = 0;
12
+    double input2 = 0;
13
+    String operation = "";
14
+    double answer;
15
+    
16
+    public void Basic()
17
+    {
18
+        Console.println("Basic Calculator Options" 
19
+                         + "\n1: Addition"
20
+                         + "\n2: Subtraction"
21
+                         + "\n3: Multiplication"
22
+                         + "\n4: Division"
23
+                         + "\n5: Cancel - returns to Main Menu");        
24
+
25
+    }
26
+
27
+    //addition method
28
+    public double getSum(double x, double y) {
29
+        answer = x + y;
30
+        return answer;
31
+    }
32
+    
33
+    //subtraction method
34
+    public double getDiff(double x, double y) {
35
+        answer = x - y;
36
+        return answer;
37
+    }
38
+    
39
+    //multiplication method
40
+    public double getProduct(double x, double y) {
41
+        answer = x * y;
42
+        return answer;
43
+    }
44
+    
45
+    //division method
46
+    public double getQuotient(double x, double y) {
47
+        answer = x / y;
48
+        return answer;
49
+    }
50
+}
51
+
52
+        

+ 139
- 0
BasicTest.java Wyświetl plik

@@ -0,0 +1,139 @@
1
+
2
+
3
+import static org.junit.Assert.*;
4
+import org.junit.After;
5
+import org.junit.Before;
6
+import org.junit.Test;
7
+
8
+/**
9
+ * The test class BasicTest.
10
+ *
11
+ * @author  (your name)
12
+ * @version (a version number or a date)
13
+ */
14
+public class BasicTest
15
+{
16
+    /**
17
+     * Default constructor for test class BasicTest
18
+     */
19
+    public BasicTest()
20
+    {
21
+    }
22
+
23
+    /**
24
+     * Sets up the test fixture.
25
+     *
26
+     * Called before every test case method.
27
+     */
28
+    @Before
29
+    public void setUp()
30
+    {
31
+    }
32
+
33
+    /**
34
+     * Tears down the test fixture.
35
+     *
36
+     * Called after every test case method.
37
+     */
38
+    @After
39
+    public void tearDown()
40
+    {
41
+    }
42
+
43
+    @Test
44
+    public void testAdd()
45
+    {
46
+        Basic basic1 = new Basic();
47
+        assertEquals(14, basic1.getSum(4, 10), 0.1);
48
+    }
49
+
50
+    @Test
51
+    public void testAddDec()
52
+    {
53
+        Basic basic1 = new Basic();
54
+        assertEquals(13.27, basic1.getSum(13.2, 0.07), 0.1);
55
+    }
56
+
57
+    @Test
58
+    public void testAddNeg()
59
+    {
60
+        Basic basic1 = new Basic();
61
+        basic1.Basic();
62
+        assertEquals(6, basic1.getSum(-3, 9), 0.1);
63
+    }
64
+
65
+    @Test
66
+    public void testSub()
67
+    {
68
+        Basic basic1 = new Basic();
69
+        assertEquals(5, basic1.getDiff(10, 5), 0.1);
70
+    }
71
+
72
+    @Test
73
+    public void testSubDec()
74
+    {
75
+        Basic basic1 = new Basic();
76
+        assertEquals(4.65, basic1.getDiff(13.2, 8.55), 0.1);
77
+    }
78
+
79
+    @Test
80
+    public void testSubNeg()
81
+    {
82
+        Basic basic1 = new Basic();
83
+        assertEquals(18, basic1.getDiff(6, -12), 0.1);
84
+    }
85
+
86
+    @Test
87
+    public void testMul()
88
+    {
89
+        Basic basic1 = new Basic();
90
+        assertEquals(15, basic1.getProduct(3, 5), 0.1);
91
+    }
92
+
93
+    @Test
94
+    public void testMulDec()
95
+    {
96
+        Basic basic1 = new Basic();
97
+        assertEquals(6.8, basic1.getProduct(3.4, 2), 0.1);
98
+    }
99
+
100
+    @Test
101
+    public void testMulNeg()
102
+    {
103
+        Basic basic1 = new Basic();
104
+        assertEquals(10, basic1.getProduct(-2, -5), 0.1);
105
+    }
106
+
107
+    @Test
108
+    public void testDiv()
109
+    {
110
+        Basic basic1 = new Basic();
111
+        assertEquals(4, basic1.getQuotient(12, 3), 0.1);
112
+    }
113
+
114
+    @Test
115
+    public void testDivDec()
116
+    {
117
+        Basic basic1 = new Basic();
118
+        assertEquals(7.4, basic1.getQuotient(14.8, 2), 0.1);
119
+    }
120
+
121
+    @Test
122
+    public void testDivNeg()
123
+    {
124
+        Basic basic1 = new Basic();
125
+        assertEquals(-3, basic1.getQuotient(-12, 4), 0.1);
126
+    }
127
+}
128
+
129
+
130
+
131
+
132
+
133
+
134
+
135
+
136
+
137
+
138
+
139
+

+ 32
- 0
MainMenu.java Wyświetl plik

@@ -0,0 +1,32 @@
1
+
2
+/**
3
+ * Scientific Calculator Lab
4
+ * 
5
+ * This class will create the instance of the "Main Menu"
6
+ * 
7
+ * This serves to display the options the user can take to use the calculator
8
+ * 
9
+ * 1: Basic Menu - 4 basic functions + - * /
10
+ * 2: Advanced Menu - Exponents & inverse
11
+ * 3: Scientific Menu - Base Conversions, Memory Functions, Trig Options
12
+ * 
13
+ * The point of this method is for the MAIN Application while loop.
14
+ * Whenever the user opens the calculator OR completes an action
15
+ * in the submenus, the calculator will return to this main menu.
16
+ */
17
+public class MainMenu
18
+{
19
+    /**
20
+     * Method to display the main menu
21
+     */
22
+    
23
+    public void mainMenuDisplay()
24
+    {
25
+        Console.println("\nCalculator Options:"
26
+                         + "\n1: Basic Calculator (+ - * /)"
27
+                         + "\n2: Advanced Calculator (Exponential Functions)"
28
+                         + "\n3: Scientific Functions (Base Conversion, Memory, Trigonometry)"
29
+                         + "\n4: Exit the calculator");
30
+        
31
+    }
32
+}

+ 75
- 0
MemoryFunc.java Wyświetl plik

@@ -0,0 +1,75 @@
1
+
2
+/**
3
+
4
+ */
5
+public class MemoryFunc {
6
+    public Double memory;
7
+    public Boolean memoryChanged;
8
+    public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
9
+
10
+    public MemoryFunc() {
11
+        this.memory = DEFAULT_MEMORY_VALUE;
12
+        this.memoryChanged = false;
13
+    }
14
+    
15
+    /**
16
+     * Menu
17
+     * Clear
18
+     * Print
19
+     * Update
20
+     */
21
+    
22
+    public void memoryMenu() {
23
+        
24
+        Console.println("Memory Menu"
25
+                         + "\n1: M+ - Update stored memory value"
26
+                         + "\n2: MC - Clear to default memory value"
27
+                         + "\n3: MCR - Display stored memory value"
28
+                         + "\n4: Cancel - Returns to Main Menu");
29
+                         
30
+        String memoryOpt = "";
31
+        
32
+        while (!memoryOpt.equals("4")) {
33
+            
34
+            memoryOpt = Console.getStringInput("Select option by typing the key. (ie. 1 for M+)");
35
+            
36
+            if (memoryOpt.equals("1")) {
37
+                
38
+                Double newMemory = Console.getDoubleInput("Enter the value to store");
39
+                this.memory = updateMemory(newMemory);
40
+                this.memoryChanged = true;
41
+                break;
42
+                
43
+            } else if (memoryOpt.equals("2")) {
44
+                
45
+                clearMemory();
46
+                Console.println("Memory cleared.");
47
+                this.memoryChanged = false;
48
+                break;
49
+                
50
+            } else if (memoryOpt.equals("3")) {
51
+                
52
+                Console.println("Stored Value: " + displayMemory());
53
+                break;
54
+                
55
+            } else {
56
+                
57
+                Console.println("Invalid Option");
58
+                
59
+            }
60
+        }
61
+    }
62
+    
63
+    public Double updateMemory(Double memoryInput) {
64
+        return this.memory = memoryInput;
65
+    }
66
+    
67
+    public Double clearMemory() {
68
+        return this.memory = DEFAULT_MEMORY_VALUE;
69
+    }
70
+    
71
+    public Double displayMemory() {
72
+        return this.memory;
73
+    }
74
+    
75
+}

+ 57
- 0
RealAdvanced.java Wyświetl plik

@@ -0,0 +1,57 @@
1
+
2
+/**
3
+ * Method for the RealAdvanced class
4
+ *
5
+ * @Michelle DiMarino
6
+ * @10.21.18
7
+ */
8
+
9
+import java.util.*;
10
+
11
+public class RealAdvanced
12
+{
13
+
14
+    public void realAdvanced()
15
+    {
16
+        Console.println("Please Select one of the following Calculations: " +"\n"+
17
+            "1: x^2" + "\n"+
18
+            "2: x^y" + "\n"+
19
+            "3: 1/x" + "\n"+
20
+            "4: Switch Sign of x" + "\n"+
21
+            "5: Absolute Value of x" + "\n"+
22
+            "6: Square Root of x" + "\n"+
23
+            "7: Factorial x!"+"\n"+
24
+            "8: Return to Main Menu");
25
+
26
+    }
27
+    // method to find x^2
28
+    public double squared(double x){
29
+        return Math.pow(x,2);
30
+    }
31
+    // method to find x^y
32
+    public double exponent(double x, double y){
33
+        return Math.pow(x,y);
34
+    }
35
+    // method to find the inverse of x
36
+    public double inverse(double x){
37
+        return 1/x;
38
+    }
39
+    // method to switch sign of x
40
+    public double opposite(double x){
41
+        double opposite1 = -1 * x;
42
+        return opposite1;
43
+    }
44
+    public double absoluteValue(double x){
45
+        return Math.abs(x);
46
+    }
47
+public double sqrt(double x){
48
+    return Math.sqrt(x);
49
+}
50
+public double factorial(double x){
51
+    double answer = 1;
52
+    for (double i = x; i >0; i--){
53
+        answer = answer * i;
54
+    }
55
+    return answer;
56
+}
57
+}

+ 98
- 0
RealAdvancedTest.java Wyświetl plik

@@ -0,0 +1,98 @@
1
+
2
+
3
+import static org.junit.Assert.*;
4
+import org.junit.After;
5
+import org.junit.Before;
6
+import org.junit.Test;
7
+
8
+/**
9
+ * The test class RealAdvancedTest.
10
+ *
11
+ * @author  (your name)
12
+ * @version (a version number or a date)
13
+ */
14
+public class RealAdvancedTest
15
+{
16
+    /**
17
+     * Default constructor for test class RealAdvancedTest
18
+     */
19
+    public RealAdvancedTest()
20
+    {
21
+    }
22
+
23
+    /**
24
+     * Sets up the test fixture.
25
+     *
26
+     * Called before every test case method.
27
+     */
28
+    @Before
29
+    public void setUp()
30
+    {
31
+    }
32
+
33
+    /**
34
+     * Tears down the test fixture.
35
+     *
36
+     * Called after every test case method.
37
+     */
38
+    @After
39
+    public void tearDown()
40
+    {
41
+    }
42
+
43
+    @Test
44
+    public void squaredTest()
45
+    {
46
+        RealAdvanced realAdva1 = new RealAdvanced();
47
+        assertEquals(9.0, realAdva1.squared(3), 0.1);
48
+    }
49
+
50
+    @Test
51
+    public void exponentTest()
52
+    {
53
+        RealAdvanced realAdva1 = new RealAdvanced();
54
+        assertEquals(8.0, realAdva1.exponent(2, 3), 0.1);
55
+    }
56
+
57
+    @Test
58
+    public void oppositeTest()
59
+    {
60
+        RealAdvanced realAdva1 = new RealAdvanced();
61
+        assertEquals(2.0, realAdva1.opposite(-2), 0.1);
62
+    }
63
+
64
+    @Test
65
+    public void inverseTest()
66
+    {
67
+        RealAdvanced realAdva1 = new RealAdvanced();
68
+        assertEquals(0.5, realAdva1.inverse(2), 0.1);
69
+    }
70
+
71
+    @Test
72
+    public void absoluteTest()
73
+    {
74
+        RealAdvanced realAdva1 = new RealAdvanced();
75
+        assertEquals(4.0, realAdva1.absoluteValue(-4), 0.1);
76
+    }
77
+
78
+    @Test
79
+    public void squareRootTest()
80
+    {
81
+        RealAdvanced realAdva1 = new RealAdvanced();
82
+        assertEquals(5.0, realAdva1.sqrt(25), 0.1);
83
+    }
84
+
85
+    @Test
86
+    public void factorialTest()
87
+    {
88
+        RealAdvanced realAdva1 = new RealAdvanced();
89
+        assertEquals(120.0, realAdva1.factorial(5), 0.1);
90
+    }
91
+}
92
+
93
+
94
+
95
+
96
+
97
+
98
+

+ 19
- 0
SciCalc.java Wyświetl plik

@@ -0,0 +1,19 @@
1
+
2
+/**
3
+* 4.2 Scientific Calculator Group Project
4
+* Trinh Tong, Lauren Green, Michelle Dimarino
5
+* Advanced Calculator Menu
6
+*/
7
+public class SciCalc 
8
+{
9
+
10
+
11
+    public void toSciMenu() {
12
+        Console.println("Scientific Calculator Functions:"
13
+                         + "\n1: Base Conversion - Converts input to selected base"
14
+                         + "\n2: Memory - Memory functions"
15
+                         + "\n3: Trigonometry "
16
+                         + "\n4: Return to Main Menu");        
17
+        
18
+    }
19
+}

+ 71
- 0
SwitchDisplay.java Wyświetl plik

@@ -0,0 +1,71 @@
1
+
2
+/**
3
+ * Write a description of class SwitchDisplay here.
4
+ *
5
+ * Scientific Calculator Lab
6
+ * 
7
+ * Brings up the switch display menu
8
+ * Binary
9
+ * Octal
10
+ * Decimal
11
+ * Hexadecimal
12
+ * 
13
+ * Changes the mode for EVERYTHING
14
+ * 
15
+ * Find a way to store the input and the input as a diff base
16
+ * then whenever the base is changed, display the base.
17
+ * pass the input into the methods to return the string.
18
+ * EVERY TIME AN INPUT IS PLACED, IT WILL BE DISPLAYED AS AN OCTAL
19
+ * boolean baseChange == true; 
20
+ *      display the changed display
21
+ */
22
+public class SwitchDisplay
23
+{
24
+    // instance variables - replace the example below with your own
25
+
26
+    /**
27
+     * Switch Display Mode method 
28
+     * -> binary, octal, decimal, hexadecimal
29
+     * switchDisplayMode() rotates through the options
30
+     * switchDisplayMode(String mode) sets the display to the mode given
31
+     */
32
+    
33
+    public void switchDisplay()
34
+    {
35
+            Console.println("Display Options" 
36
+                             + "\n1: Binary"
37
+                             + "\n2: Octal"
38
+                             + "\n3: Decimal"
39
+                             + "\n4: Hexadecimal"
40
+                             + "\n5: Cancel - returns to Main Menu");
41
+                         
42
+    }
43
+
44
+    /**
45
+     * Converts the user input into corresponding base types
46
+     */
47
+    
48
+    public String toBinary(double userInput) {
49
+        
50
+        return Integer.toBinaryString((int)userInput);
51
+        
52
+    }
53
+    
54
+    public String toOctal(double userInput) {
55
+        
56
+        return Integer.toOctalString((int)userInput);
57
+        
58
+    }
59
+    
60
+    public String toDecimal(int userInput) {
61
+        
62
+        return Integer.toString(userInput);
63
+        
64
+    }
65
+    
66
+    public String toHexa(int userInput) {
67
+    
68
+        return Integer.toHexString((int)userInput);
69
+    
70
+    }
71
+}

+ 74
- 0
SwitchDisplayTest.java Wyświetl plik

@@ -0,0 +1,74 @@
1
+
2
+
3
+import static org.junit.Assert.*;
4
+import org.junit.After;
5
+import org.junit.Before;
6
+import org.junit.Test;
7
+
8
+/**
9
+ * The test class SwitchDisplayTest.
10
+ *
11
+ * @author  (your name)
12
+ * @version (a version number or a date)
13
+ */
14
+public class SwitchDisplayTest
15
+{
16
+    /**
17
+     * Default constructor for test class SwitchDisplayTest
18
+     */
19
+    public SwitchDisplayTest()
20
+    {
21
+    }
22
+
23
+    /**
24
+     * Sets up the test fixture.
25
+     *
26
+     * Called before every test case method.
27
+     */
28
+    @Before
29
+    public void setUp()
30
+    {
31
+    }
32
+
33
+    /**
34
+     * Tears down the test fixture.
35
+     *
36
+     * Called after every test case method.
37
+     */
38
+    @After
39
+    public void tearDown()
40
+    {
41
+    }
42
+
43
+    @Test
44
+    public void toBinary()
45
+    {
46
+        SwitchDisplay switchDi1 = new SwitchDisplay();
47
+        assertEquals("101101", switchDi1.toBinary(45));
48
+    }
49
+
50
+    @Test
51
+    public void toOctal()
52
+    {
53
+        SwitchDisplay switchDi1 = new SwitchDisplay();
54
+        assertEquals("55", switchDi1.toOctal(45));
55
+    }
56
+
57
+    @Test
58
+    public void toHexa()
59
+    {
60
+        SwitchDisplay switchDi1 = new SwitchDisplay();
61
+        assertEquals("2d", switchDi1.toHexa(45));
62
+    }
63
+
64
+    @Test
65
+    public void toDecimal()
66
+    {
67
+        SwitchDisplay switchDi1 = new SwitchDisplay();
68
+        assertEquals("45", switchDi1.toDecimal(45));
69
+    }
70
+}
71
+
72
+
73
+
74
+

+ 82
- 0
Trig.java Wyświetl plik

@@ -0,0 +1,82 @@
1
+
2
+/**
3
+ * Trig class to perform trig function for our Graphing Calculator
4
+ * (sin, cos, tan, inverses, degree to radian)
5
+ * Lauren Green
6
+ * 10/19/18
7
+ */
8
+public class Trig
9
+{
10
+    double input = 0.0;
11
+    double answer;
12
+    String operation = "";
13
+
14
+    public void trigFunctions()
15
+    {
16
+        Console.println("Trigonometry Calculator Options" 
17
+            + "\n1: sin"
18
+            + "\n2: cosin"
19
+            + "\n3: tan"
20
+            + "\n4: arcsin"
21
+            + "\n5: arccosin"
22
+            + "\n6: arctan"
23
+            + "\n7: log"
24
+            + "\n8: Cancel - returns to Main Menu");   
25
+
26
+        
27
+    }
28
+
29
+    //Sin method
30
+    public double calcSin(double x) {
31
+        answer = Math.sin(x);
32
+        return answer;
33
+    }
34
+
35
+    //Cos method
36
+    public double calcCos(double x) {
37
+        answer = Math.cos(x);
38
+        return answer;
39
+    }
40
+
41
+    //Tan method
42
+    public double calcTan(double x) {
43
+        answer = Math.tan(x);
44
+        return answer;
45
+    }
46
+
47
+    //Arcsin method
48
+    public double calcArcsin(double x) {
49
+        answer = Math.asin(x);
50
+        return answer;
51
+    }
52
+
53
+    //Arccos method
54
+    public double calcArccos(double x) {
55
+        answer = Math.acos(x);
56
+        return answer;
57
+    }
58
+
59
+    //Arctan method
60
+    public double calcArctan(double x) {
61
+        answer = Math.atan(x);
62
+        return answer;
63
+    }
64
+
65
+    //Log Method
66
+    public double calcLog(double x) {
67
+        answer = Math.log10(x);
68
+        return answer;
69
+    }
70
+    
71
+    //Converting from Radians to Degrees
72
+    public double toDegrees(double answer) 
73
+    {
74
+        double conversion = Math.toDegrees(answer);
75
+        answer = conversion;
76
+        return answer;
77
+
78
+    }
79
+    
80
+    
81
+}
82
+

+ 106
- 0
TrigTest.java Wyświetl plik

@@ -0,0 +1,106 @@
1
+
2
+
3
+import static org.junit.Assert.*;
4
+import org.junit.After;
5
+import org.junit.Before;
6
+import org.junit.Test;
7
+
8
+/**
9
+ * The test class TrigTest.
10
+ *
11
+ * @author  (your name)
12
+ * @version (a version number or a date)
13
+ */
14
+public class TrigTest
15
+{
16
+    /**
17
+     * Default constructor for test class TrigTest
18
+     */
19
+    public TrigTest()
20
+    {
21
+    }
22
+
23
+    /**
24
+     * Sets up the test fixture.
25
+     *
26
+     * Called before every test case method.
27
+     */
28
+    @Before
29
+    public void setUp()
30
+    {
31
+    }
32
+
33
+    /**
34
+     * Tears down the test fixture.
35
+     *
36
+     * Called after every test case method.
37
+     */
38
+    @After
39
+    public void tearDown()
40
+    {
41
+    }
42
+
43
+    @Test
44
+    public void testSIN()
45
+    {
46
+        Trig trig1 = new Trig();
47
+        assertEquals(-0.54402111088, trig1.calcSin(10), 0.1);
48
+    }
49
+
50
+    @Test
51
+    public void testCOS()
52
+    {
53
+        Trig trig1 = new Trig();
54
+        assertEquals(-0.83907152907, trig1.calcCos(10), 0.1);
55
+    }
56
+
57
+    @Test
58
+    public void testTAN()
59
+    {
60
+        Trig trig1 = new Trig();
61
+        assertEquals(0.64836082745, trig1.calcTan(10), 0.1);
62
+    }
63
+
64
+    @Test
65
+    public void testRadtoDeg()
66
+    {
67
+        Trig trig1 = new Trig();
68
+        assertEquals(37.14833901458697, trig1.toDegrees(0.64836082745), 0.1);
69
+    }
70
+
71
+    @Test
72
+    public void testArcSin()
73
+    {
74
+        Trig trig2 = new Trig();
75
+        assertEquals(0.523598776, trig2.calcArcsin(0.5), 0.1);
76
+    }
77
+
78
+    @Test
79
+    public void testArcTan()
80
+    {
81
+        Trig trig1 = new Trig();
82
+        assertEquals(0.463647609, trig1.calcArctan(0.5), 0.1);
83
+    }
84
+
85
+    @Test
86
+    public void testArcCos()
87
+    {
88
+        Trig trig1 = new Trig();
89
+        assertEquals(1.04719755, trig1.calcArccos(0.5), 0.1);
90
+    }
91
+
92
+    @Test
93
+    public void testLog()
94
+    {
95
+        Trig trig1 = new Trig();
96
+        assertEquals(1, trig1.calcLog(10), 0.1);
97
+    }
98
+}
99
+
100
+
101
+
102
+
103
+
104
+
105
+
106
+

+ 15
- 15
package.bluej Wyświetl plik

@@ -56,17 +56,17 @@ dependency8.type=UsesDependency
56 56
 dependency9.from=MainApplication
57 57
 dependency9.to=Console
58 58
 dependency9.type=UsesDependency
59
-editor.fx.0.height=673
60
-editor.fx.0.width=1081
61
-editor.fx.0.x=296
62
-editor.fx.0.y=175
59
+editor.fx.0.height=0
60
+editor.fx.0.width=0
61
+editor.fx.0.x=0
62
+editor.fx.0.y=0
63 63
 objectbench.height=214
64 64
 objectbench.width=595
65 65
 package.divider.horizontal=0.6
66 66
 package.divider.vertical=0.6847360912981455
67 67
 package.editor.height=473
68 68
 package.editor.width=493
69
-package.editor.x=39
69
+package.editor.x=38
70 70
 package.editor.y=27
71 71
 package.frame.height=759
72 72
 package.frame.width=619
@@ -138,19 +138,19 @@ target4.width=140
138 138
 target4.x=100
139 139
 target4.y=230
140 140
 target5.height=50
141
-target5.name=MainMenu
141
+target5.name=SwitchDisplayTest
142 142
 target5.showInterface=false
143
-target5.type=ClassTarget
144
-target5.width=90
145
-target5.x=70
146
-target5.y=10
143
+target5.type=UnitTestTargetJunit4
144
+target5.width=110
145
+target5.x=110
146
+target5.y=320
147 147
 target6.height=50
148
-target6.name=SwitchDisplayTest
148
+target6.name=MainMenu
149 149
 target6.showInterface=false
150
-target6.type=UnitTestTargetJunit4
151
-target6.width=110
152
-target6.x=110
153
-target6.y=320
150
+target6.type=ClassTarget
151
+target6.width=90
152
+target6.x=70
153
+target6.y=10
154 154
 target7.height=50
155 155
 target7.name=SciCalc
156 156
 target7.showInterface=false