Calculator.java

@@ -1,36 +0,0 @@
-package guangzhaowei;
-import java.util.Scanner;
- 
-public class Calculator{
-
-	public static void main(String[] args){
-		char e;
-		boolean f=true;
-		Scanner in = new Scanner(System.in);		
-		while(f){
-			System.out.println("请选择运算方式：+、-、*、/、^、"
-					+ "对数：l，三角函数：s；或者退出：e");
-			e=in.next().charAt(0);	
-			switch(e){			
-				case '+':case '-':case '*':case '/':
-					Easy.c();
-					break;
-				case '^':
-					Exp.pow();
-					break;
-				case 'l':
-					Logarithm.log();
-					break;
-				case 's':
-					Triangle.angle();
-					break;
-				case 't':
-					f=false;
-			}
-		}
-	}
-}
-
- 
-
- 

Easy.java

@@ -1,22 +0,0 @@
-package guangzhaowei;
-
-import java.util.Scanner;
-
-public class Easy {
-	public static void c(){
-		Scanner sc=new Scanner(System.in);
-		System.out.println("请输入第一个数字:");
-		double x=sc.nextDouble();
-		System.out.println("请输入第二个数字");
-		double y=sc.nextDouble();
-		System.out.println("请选择相应的数字来进行相应的运算(1:加法   2:减法  3:乘法  4:除法)");
-		int c=sc.nextInt();
-		double d=0;
-		switch(c) {
-		case 1:d=x+y;System.out.println("运算结果是 "+d);break;
-		case 2:d=x-y;System.out.println("运算结果是 "+d);break;
-		case 3:d=x*y;System.out.println("运算结果是 "+d);break;
-		case 4:d=x/y;System.out.println("运算结果是 "+d);break;
-		}
-	}
-}

Exp.java

@@ -1,12 +0,0 @@
-package guangzhaowei;
-import java.util.Scanner;
-public class Exp {
-	public static void pow() {
-		System.out.println("请输入指数");
-		Scanner sc= new Scanner(System.in);
-		double a=sc.nextDouble();	
-		double b = Math.E;
-		double c = Math.pow(b, a);
-		System.out.println("运算结果是"+c);
-	}
-}

Logarithm.java

@@ -1,15 +0,0 @@
-package guangzhaowei;
-
-import java.util.Scanner;
-
-public class Logarithm {
-	public static void log() {
-		Scanner sc= new Scanner(System.in);
-		System.out.println("请输入对数：");
-		double base=sc.nextDouble();
-		System.out.println("请输入真数：");
-		double value=sc.nextDouble();
-		double result=Math.log(value)/Math.log(base);
-		System.out.println("运算结果是"+result);
-	}
-}

Triangle.java

@@ -1,35 +0,0 @@
-package guangzhaowei;
-
-import java.util.Scanner;
-
-public class Triangle {
-    public static void angle(){
-		Scanner sc= new Scanner(System.in);
-    	System.out.println("三角函数类型：");
-		String b=sc.next();
-		System.out.println("数值：");
-		double a=sc.nextDouble();
-    	double c = Math.toRadians(a);
-        if (a % 180 == 0 && b.equals("sin")) {
-            System.out.println("运算结果是0");
-        }
-        if (a % 90 == 0 && a % 180 != 0 && b.equals("cos")) {
-        	System.out.println("运算结果是0");
-        }
-
-        switch (b) {
-            case "cos":
-               System.out.println("运算结果是"+Math.cos(c));
-               break;
-            case "sin":
-            	System.out.println("运算结果是"+Math.sin(c));
-            	break;
-            case "tan":
-            	System.out.println("运算结果是"+Math.tan(c));   
-            	break;
-            case "cot":
-            	System.out.println("运算结果是"+1 / Math.tan(c)); 
-            	break;
-        }
-    }
-}

d.java

@@ -0,0 +1,23 @@
+public class d {
+    public static double angle(double a, String b) {
+        double c = Math.toRadians(a);
+        if (a % 180 == 0 && b.equals("sin")) {
+            return 0;
+        }
+        if (a % 90 == 0 && a % 180 != 0 && b.equals("cos")) {
+            return 0;
+        }
+
+        switch (b) {
+            case "cos":
+                return Math.cos(c);
+            case "sin":
+                return Math.sin(c);
+            case "tan":
+                return Math.tan(c);
+            case "cot":
+                return 1 / Math.tan(c);
+        }
+        return -1;
+    }
+}