Merge remote-tracking branch 'origin/master'

Equations.iml

@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

src/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: main.io.github.ethankelly.Main
+Main-Class: io.github.ethankelly.Main
 

src/main/io/github/ethankelly/Equations.java → src/io/github/ethankelly/Equations.java

@@ -1,7 +1,7 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.symbols.Greek;
-import main.io.github.ethankelly.symbols.Maths;
+import io.github.ethankelly.symbols.Greek;
+import io.github.ethankelly.symbols.Maths;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/io/github/ethankelly/Graph.java → src/io/github/ethankelly/Graph.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.text.MessageFormat;
 import java.util.*;

src/main/io/github/ethankelly/GraphGenerator.java → src/io/github/ethankelly/GraphGenerator.java

@@ -1,8 +1,8 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.std.Set;
-import main.io.github.ethankelly.std.Rand;
-import main.io.github.ethankelly.std.MinPriorityQueue;
+import io.github.ethankelly.std.MinPriorityQueue;
+import io.github.ethankelly.std.Rand;
+import io.github.ethankelly.std.Set;
 
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;

src/main/io/github/ethankelly/Main.java → src/io/github/ethankelly/Main.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

src/main/io/github/ethankelly/Tuple.java → src/io/github/ethankelly/Tuple.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/io/github/ethankelly/Vertex.java → src/io/github/ethankelly/Vertex.java

@@ -1,6 +1,6 @@
-package main.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.symbols.Maths;
+import io.github.ethankelly.symbols.Maths;
 
 import java.util.List;
 import java.util.stream.IntStream;

src/main/io/github/ethankelly/std/In.java → src/io/github/ethankelly/std/In.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.*;
 import java.util.regex.Pattern;

src/main/io/github/ethankelly/std/MinPriorityQueue.java → src/io/github/ethankelly/std/MinPriorityQueue.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.Comparator;
 import java.util.Iterator;

src/main/io/github/ethankelly/std/Out.java → src/io/github/ethankelly/std/Out.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;

src/main/io/github/ethankelly/std/Queue.java → src/io/github/ethankelly/std/Queue.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

src/main/io/github/ethankelly/std/Rand.java → src/io/github/ethankelly/std/Rand.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 /**
  * The {@code StdRandom} class provides static methods for generating pseudo-random numbers from various discrete and

src/main/io/github/ethankelly/std/Set.java → src/io/github/ethankelly/std/Set.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.std;
+package io.github.ethankelly.std;
 
 
 import java.util.Iterator;

src/main/io/github/ethankelly/symbols/Greek.java → src/io/github/ethankelly/symbols/Greek.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.symbols;
+package io.github.ethankelly.symbols;
 
 @SuppressWarnings("unused")
 public enum Greek {

src/main/io/github/ethankelly/symbols/Maths.java → src/io/github/ethankelly/symbols/Maths.java

@@ -1,4 +1,4 @@
-package main.io.github.ethankelly.symbols;
+package io.github.ethankelly.symbols;
 
 public enum Maths {
 

src/test/io/github/ethankelly/EquationsTest.java → test/io/github/ethankelly/EquationsTest.java

@@ -1,6 +1,5 @@
-package test.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.Equations;
 import org.junit.jupiter.api.Assertions;
 
 class EquationsTest {

src/test/io/github/ethankelly/GraphTest.java → test/io/github/ethankelly/GraphTest.java

@@ -1,7 +1,5 @@
-package test.io.github.ethankelly;
+package io.github.ethankelly;
 
-import main.io.github.ethankelly.Graph;
-import main.io.github.ethankelly.GraphGenerator;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;