From dd4c492854ec2fff120e375cd5a0c1e0ad338a9d Mon Sep 17 00:00:00 2001 From: Martin Goik <goik@hdm-stuttgart.de> Date: Mon, 12 Dec 2016 08:20:14 +0100 Subject: [PATCH] Removing old exercise variant --- Exam/Sd1/Diff/Diff/.gitignore | 4 -- Exam/Sd1/Diff/Diff/pom.xml | 36 ----------------- .../de/hdm_stuttgart/mi/sd1/store/Diff.java | 27 ------------- .../mi/sd1/store/package-info.java | 5 --- .../mi/sd1/fraction/DiffTest.java | 32 --------------- Exam/Sd1/Diff/DiffSolution/.gitignore | 4 -- Exam/Sd1/Diff/DiffSolution/pom.xml | 37 ------------------ .../de/hdm_stuttgart/mi/sd1/store/Diff.java | 30 -------------- .../mi/sd1/store/package-info.java | 5 --- .../mi/sd1/fraction/DiffTest.java | 29 -------------- Exam/Sd1/MaxArrayDiff/Solution/.gitignore | 4 -- Exam/Sd1/MaxArrayDiff/Solution/pom.xml | 37 ------------------ .../mi/sd1/maxarraydiff/Calc.java | 33 ---------------- .../mi/sd1/maxarraydiff/package-info.java | 5 --- .../mi/sd1/fraction/CalcTest.java | 33 ---------------- Exam/Sd1/MaxArrayDiff/Test/.gitignore | 4 -- Exam/Sd1/MaxArrayDiff/Test/pom.xml | 39 ------------------- .../mi/sd1/maxarraydiff/Calc.java | 25 ------------ .../mi/sd1/maxarraydiff/package-info.java | 5 --- .../de/hdm_stuttgart/mi/sd1/CalcTest.java | 37 ------------------ 20 files changed, 431 deletions(-) delete mode 100644 Exam/Sd1/Diff/Diff/.gitignore delete mode 100644 Exam/Sd1/Diff/Diff/pom.xml delete mode 100644 Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java delete mode 100644 Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java delete mode 100644 Exam/Sd1/Diff/Diff/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java delete mode 100644 Exam/Sd1/Diff/DiffSolution/.gitignore delete mode 100644 Exam/Sd1/Diff/DiffSolution/pom.xml delete mode 100644 Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java delete mode 100644 Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java delete mode 100644 Exam/Sd1/Diff/DiffSolution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Solution/.gitignore delete mode 100644 Exam/Sd1/MaxArrayDiff/Solution/pom.xml delete mode 100644 Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Solution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/CalcTest.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Test/.gitignore delete mode 100644 Exam/Sd1/MaxArrayDiff/Test/pom.xml delete mode 100644 Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java delete mode 100644 Exam/Sd1/MaxArrayDiff/Test/src/test/java/de/hdm_stuttgart/mi/sd1/CalcTest.java diff --git a/Exam/Sd1/Diff/Diff/.gitignore b/Exam/Sd1/Diff/Diff/.gitignore deleted file mode 100644 index 4e247eee2..000000000 --- a/Exam/Sd1/Diff/Diff/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.settings -/target -/.classpath -/.project diff --git a/Exam/Sd1/Diff/Diff/pom.xml b/Exam/Sd1/Diff/Diff/pom.xml deleted file mode 100644 index 8156c42e2..000000000 --- a/Exam/Sd1/Diff/Diff/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>de.hdm-stuttgart.de.sd1</groupId> - <artifactId>diff</artifactId> - <version>1.0</version> - <packaging>jar</packaging> - - <name>Diff</name> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - </plugins> - </build> - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - -</dependencies> -</project> diff --git a/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java b/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java deleted file mode 100644 index 1d0e1657d..000000000 --- a/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.store; - -/** - * Additional helper methods - * - */ -public class Diff { - /** - * Compute the absolute value of the biggest difference between - * two of three given numbers a, b, and c - * - * Examples: - * - * a == 1, b == 2, c ==10, the biggest absolute difference is 10 - 1 = 9 - * a == 4, b ==10, c == 1, the biggest absolute difference is 10 - 1 = 9 - * a ==-3, b == 4, c == 3, the biggest absolute difference is 4 - (-3) = 7 - * - * - * @param a The first of three parameters - * @param b The second of three parameters - * @param c The third of three parameters - * @return The absolute value of the biggest difference between two arbitrary parameters - */ - public static int maxDiff(int a, int b, int c) { - return 0; // TODO: Implementation to be completed - } -} diff --git a/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java b/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java deleted file mode 100644 index 24b57ed19..000000000 --- a/Exam/Sd1/Diff/Diff/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Dealing with difference values - * - */ -package de.hdm_stuttgart.mi.sd1.store; \ No newline at end of file diff --git a/Exam/Sd1/Diff/Diff/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java b/Exam/Sd1/Diff/Diff/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java deleted file mode 100644 index 0af65e704..000000000 --- a/Exam/Sd1/Diff/Diff/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.fraction; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import de.hdm_stuttgart.mi.sd1.store.Diff; - - -/** - * Testing max diff function - * - */ -public class DiffTest { - - /** - * Test absolute maximal difference - */ - - /* TODO: Remove me to activate testing - @Test - */ - public void testDiff() { - assertEquals(0, Diff.maxDiff(0, 0, 0)); - assertEquals(0, Diff.maxDiff(1, 1, 1)); - assertEquals(2, Diff.maxDiff(1, 2, 3)); - assertEquals(3, Diff.maxDiff(4, 1, 4)); - assertEquals(3, Diff.maxDiff(-1, -2, -4)); - assertEquals(1, Diff.maxDiff(2, 2, 3)); - - } -} diff --git a/Exam/Sd1/Diff/DiffSolution/.gitignore b/Exam/Sd1/Diff/DiffSolution/.gitignore deleted file mode 100644 index 4e247eee2..000000000 --- a/Exam/Sd1/Diff/DiffSolution/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.settings -/target -/.classpath -/.project diff --git a/Exam/Sd1/Diff/DiffSolution/pom.xml b/Exam/Sd1/Diff/DiffSolution/pom.xml deleted file mode 100644 index 2791378da..000000000 --- a/Exam/Sd1/Diff/DiffSolution/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>de.hdm-stuttgart.de.sd1</groupId> - <artifactId>diff</artifactId> - <version>2.0</version> - <packaging>jar</packaging> - - <name>Diff</name> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - -</dependencies> -</project> diff --git a/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java b/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java deleted file mode 100644 index d4336361c..000000000 --- a/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/Diff.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.store; - -/** - * Additional helper methods - * - */ -public class Diff { - /** - * Compute the absolute value of the biggest difference between - * two of three given numbers a, b, and c - * - * Examples: - * - * a == 1, b == 2, c ==10, the biggest absolute difference is 10 - 1 = 9 - * a == 4, b ==10, c == 1, the biggest absolute difference is 10 - 1 = 9 - * a ==-3, b == 4, c == 3, the biggest absolute difference is 4 - (-3) = 7 - * - * - * @param a The first of three parameters - * @param b The second of three parameters - * @param c The third of three parameters - * @return The absolute value of the biggest difference between two arbitrary parameters - */ - public static int maxDiff(int a, int b, int c) { - final int ab = Math.abs(a - b), - ac = Math.abs(a - c), - bc = Math.abs(b - c); - return Math.max(ab, Math.max(ac, bc)); - } -} diff --git a/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java b/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java deleted file mode 100644 index 94590c084..000000000 --- a/Exam/Sd1/Diff/DiffSolution/src/main/java/de/hdm_stuttgart/mi/sd1/store/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Dealing with integer stores. - * - */ -package de.hdm_stuttgart.mi.sd1.store; \ No newline at end of file diff --git a/Exam/Sd1/Diff/DiffSolution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java b/Exam/Sd1/Diff/DiffSolution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java deleted file mode 100644 index 211dfddcd..000000000 --- a/Exam/Sd1/Diff/DiffSolution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/DiffTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.fraction; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import de.hdm_stuttgart.mi.sd1.store.Diff; - - -/** - * Testing max diff function - * - */ -public class DiffTest { - - /** - * Test absolute maximal difference - */ - @Test - public void testDiff() { - assertEquals(0, Diff.maxDiff(0, 0, 0)); - assertEquals(0, Diff.maxDiff(1, 1, 1)); - assertEquals(2, Diff.maxDiff(1, 2, 3)); - assertEquals(3, Diff.maxDiff(4, 1, 4)); - assertEquals(3, Diff.maxDiff(-1, -2, -4)); - assertEquals(1, Diff.maxDiff(2, 2, 3)); - - } -} diff --git a/Exam/Sd1/MaxArrayDiff/Solution/.gitignore b/Exam/Sd1/MaxArrayDiff/Solution/.gitignore deleted file mode 100644 index 4e247eee2..000000000 --- a/Exam/Sd1/MaxArrayDiff/Solution/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.settings -/target -/.classpath -/.project diff --git a/Exam/Sd1/MaxArrayDiff/Solution/pom.xml b/Exam/Sd1/MaxArrayDiff/Solution/pom.xml deleted file mode 100644 index 325bd24cb..000000000 --- a/Exam/Sd1/MaxArrayDiff/Solution/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>de.hdm-stuttgart.de.sd1</groupId> - <artifactId>maxarraydiff</artifactId> - <version>2.0</version> - <packaging>jar</packaging> - - <name>MaxArrayDiff</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - </dependencies> - -</project> diff --git a/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java b/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java deleted file mode 100644 index eb1e4a4bb..000000000 --- a/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.maxarraydiff; - -/** - * Array calculations. - * - */ -public class Calc { - - /** - * Calculate the maximum of all mutual absolute - * difference values. Example: - * - * values = {1, 7, 2, -3, 4} - * - * The maximum is 7 - (-3) = 10 - * - * - * @param values An unordered list of integer values - * @return The number of vowels being contained in s. - */ - public static int maxArrayDiff (final int [] values) { - - int maxDiff = 0; - for (int i = 0; i < values.length; i++) { - for (int j = i + 1; j < values.length; j++) { - if (maxDiff < Math.abs(values[i] -values[j])) { - maxDiff = Math.abs(values[i] -values[j]); - } - } - } - return maxDiff; - } -} diff --git a/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java b/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java deleted file mode 100644 index caccbbf6b..000000000 --- a/Exam/Sd1/MaxArrayDiff/Solution/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Computing array value differences - * - */ -package de.hdm_stuttgart.mi.sd1.maxarraydiff; \ No newline at end of file diff --git a/Exam/Sd1/MaxArrayDiff/Solution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/CalcTest.java b/Exam/Sd1/MaxArrayDiff/Solution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/CalcTest.java deleted file mode 100644 index acca1325c..000000000 --- a/Exam/Sd1/MaxArrayDiff/Solution/src/test/java/de/hdm_stuttgart/mi/sd1/fraction/CalcTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.fraction; - -import org.junit.Assert; -import org.junit.Test; - -import de.hdm_stuttgart.mi.sd1.maxarraydiff.Calc; - -@SuppressWarnings("javadoc") -public class CalcTest { - - @Test public void testZero() { - Assert.assertEquals(0, Calc.maxArrayDiff(new int[]{})); - } - - @Test public void testOne() { - Assert.assertEquals(0, Calc.maxArrayDiff(new int[]{-3})); - } - - @Test public void testTwo() { - Assert.assertEquals(4, Calc.maxArrayDiff(new int[]{1, -3})); - } - - @Test public void testThree() { - Assert.assertEquals(13, Calc.maxArrayDiff(new int[]{1, 4, -9})); - } - - @Test public void testMulti() { - Assert.assertEquals(17, Calc.maxArrayDiff(new int[]{ -1, 0, -5, 3, 5, 12, 8})); - } - - - -} diff --git a/Exam/Sd1/MaxArrayDiff/Test/.gitignore b/Exam/Sd1/MaxArrayDiff/Test/.gitignore deleted file mode 100644 index 4e247eee2..000000000 --- a/Exam/Sd1/MaxArrayDiff/Test/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.settings -/target -/.classpath -/.project diff --git a/Exam/Sd1/MaxArrayDiff/Test/pom.xml b/Exam/Sd1/MaxArrayDiff/Test/pom.xml deleted file mode 100644 index 4b0704132..000000000 --- a/Exam/Sd1/MaxArrayDiff/Test/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>de.hdm-stuttgart.de.sd1</groupId> - <artifactId>maxarraydiff</artifactId> - <version>1.0</version> - <packaging>jar</packaging> - - <name>MaxArrayDiff</name> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - </dependencies> - - -</project> diff --git a/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java b/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java deleted file mode 100644 index 127e65e60..000000000 --- a/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/Calc.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.hdm_stuttgart.mi.sd1.maxarraydiff; - -/** - * Array calculations. - * - */ -public class Calc { - - /** - * Calculate the maximum of all mutual absolute - * difference values. Example: - * - * values = {1, 7, 2, -3, 4} - * - * The maximum is 7 - (-3) = 10 - * - * - * @param values An unordered list of integer values - * @return The number of vowels being contained in s. - */ - public static int maxArrayDiff (final int [] values) { - - return 0; // TODO - } -} diff --git a/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java b/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java deleted file mode 100644 index caccbbf6b..000000000 --- a/Exam/Sd1/MaxArrayDiff/Test/src/main/java/de/hdm_stuttgart/mi/sd1/maxarraydiff/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Computing array value differences - * - */ -package de.hdm_stuttgart.mi.sd1.maxarraydiff; \ No newline at end of file diff --git a/Exam/Sd1/MaxArrayDiff/Test/src/test/java/de/hdm_stuttgart/mi/sd1/CalcTest.java b/Exam/Sd1/MaxArrayDiff/Test/src/test/java/de/hdm_stuttgart/mi/sd1/CalcTest.java deleted file mode 100644 index 5a3fec0ea..000000000 --- a/Exam/Sd1/MaxArrayDiff/Test/src/test/java/de/hdm_stuttgart/mi/sd1/CalcTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.hdm_stuttgart.mi.sd1; - -import org.junit.Assert; -import org.junit.Test; - -import de.hdm_stuttgart.mi.sd1.maxarraydiff.Calc; - -@SuppressWarnings("javadoc") -public class CalcTest { - - // TODO: uncomment the following @test annotations - - // TODO @Test - public void testZero() { - Assert.assertEquals(0, Calc.maxArrayDiff(new int[]{})); - } - - // TODO @Test - public void testOne() { - Assert.assertEquals(0, Calc.maxArrayDiff(new int[]{-3})); - } - - // TODO @Test - public void testTwo() { - Assert.assertEquals(4, Calc.maxArrayDiff(new int[]{1, -3})); - } - - // TODO @Test - public void testThree() { - Assert.assertEquals(13, Calc.maxArrayDiff(new int[]{1, 4, -9})); - } - - // TODO @Test - public void testMulti() { - Assert.assertEquals(17, Calc.maxArrayDiff(new int[]{ -1, 0, -5, 3, 5, 12, 8})); - } -} -- GitLab