Merge branch 'master' of http://bdgit.educoder.net/pit2o95vh/pmcih9b3q

.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-13">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/bin/

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Educoder</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=13
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=13
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=13

hzy.txt

@@ -1,59 +0,0 @@
-package open;
-import java.util.Scanner;
-public class main {
-
-	public main() {
-	
-	}
-
-	public static void main(String[] args) {
-		double a,c; String b;
-		Scanner sc = new Scanner(System.in);
-		a=sc.nextDouble();
-		b=sc.next();
-		if(b.equals("sin")) {
-			sanjiao d=new sanjiao();
-			System.out.println(d.sanjiao("sin", a));
-		}
-		else if(b.equals("cos")) {
-			sanjiao d=new sanjiao();
-			System.out.println(d.sanjiao("cos", a));
-		}
-		else if(b.equals("tan")) {
-			sanjiao d=new sanjiao();
-			System.out.println(d.sanjiao("tan", a));
-		}
-		else if(b.equals("^")) {
-			zhishu d=new zhishu();
-			System.out.println(d.zhishu(a));
-		}
-		else if(b.equals("log")) {
-			duishu d=new duishu();
-			c=sc.nextDouble();
-			System.out.println(d.duishu(a, c));
-		}
-		else if(b.equals("+")) {
-			sizeyunsuan d=new sizeyunsuan();
-			c=sc.nextDouble();
-			System.out.println(d.add(a, c));
-		}
-		else if(b.equals("-")) {
-			sizeyunsuan d=new sizeyunsuan();
-			c=sc.nextDouble();
-			System.out.println(d.subtract(a, c));
-		}
-		else if(b.equals("*")) {
-			sizeyunsuan d=new sizeyunsuan();
-			c=sc.nextDouble();
-			System.out.println(d.multiply(a, c));
-		}
-		else if(b.equals("/")) {
-			sizeyunsuan d=new sizeyunsuan();
-			c=sc.nextDouble();
-			System.out.println(d.divide(a, c));
-		}
-		else System.out.println("错误");
-	}
-
-}
-

src/小组协同/sizeyunsuan.java

@@ -0,0 +1,32 @@
+package 小组协同;
+
+public class sizeyunsuan {
+	public double add(double add1, double add2) {
+		//加法
+		double result;
+		result = add1 + add2;
+		return result;
+	}
+	
+	public double subtract(double sub1, double sub2) {
+		//减法
+		double result;
+		result = sub1 - sub2;
+		return result;
+	}
+	
+	public double multiply(double mul1, double mul2) {
+		//乘法
+		double result;
+		result = mul1 * mul2;
+		return result;
+	}
+	
+	public double divide(double div1, double div2) {
+		//除法
+		double result;
+		result = div1 / div2;
+		return result;
+	}
+
+}

xjq.txt

@@ -1,22 +0,0 @@
-int main()
-{
-	
-    double x,k=1,f=1,e,n;
-    double a=0;
-    scanf("%lf %lf",&x,&n);
-    if(n < 0)
-    printf("error");
-    else
-    {
-    for(int i = 1;i <= n;i++)
-    {
-    	
-        a =pow((double)x,(double)i);
-        k = k*i;
-        e = a/k;
-        f += e;
-    }
-    printf("%.6lf",f);
-    }
-return 0;
-}