Moved FeasibleMinIIProperty to separate package.

src/main/java/graphgen/generator/components/properties/Property.java

@@ -21,7 +21,8 @@ import graphgen.datastructures.SeededRandom;
 import graphgen.generator.GraphGenerator;
 import graphgen.generator.components.Initializable;
 import graphgen.generator.components.edges.EdgeCreator;
-import graphgen.generator.components.properties.infeasibleMinII.InfeasibleMinIIProperty;
+import graphgen.generator.components.properties.minII.feasible.FeasibleMinIIProperty;
+import graphgen.generator.components.properties.minII.infeasible.InfeasibleMinIIProperty;
 import graphgen.graph.LayerStructure;
 import graphgen.graph.ResourceNode;
 import graphgen.observer.Observer;

src/main/java/graphgen/generator/components/properties/FeasibleMinIIProperty.java → src/main/java/graphgen/generator/components/properties/minII/feasible/FeasibleMinIIProperty.java

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties;
+package graphgen.generator.components.properties.minII.feasible;
 
 import graphgen.datastructures.Pair;
 import graphgen.enums.ModuloSchedulingFormulation;
 import graphgen.generator.GraphGenerator;
+import graphgen.generator.components.properties.Property;
 import graphgen.generator.components.properties.util.PlannedEdge;
 import graphgen.generator.components.properties.util.SCC;
 import graphgen.generator.exceptions.MinIIImpossibleException;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleCycleInspector.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleCycleInspector.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleEdgePlanner.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleEdgePlanner.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.Pair;
 import graphgen.datastructures.SeededRandom;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.InfeasibleConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.StartConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.SuffixConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.InfeasibleConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.StartConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.SuffixConfiguration;
 import graphgen.generator.components.properties.util.PlannedEdge;
 import graphgen.graph.ResourceNode;
 import graphgen.util.JavaUtils;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleMinIIProperty.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleMinIIProperty.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.Pair;
 import graphgen.generator.components.properties.Property;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.InfeasibleConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.StartConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.SuffixConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.InfeasibleConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.StartConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.SuffixConfiguration;
 import graphgen.generator.components.properties.util.PlannedEdge;
 import graphgen.generator.exceptions.InfeasibilityImpossibleException;
 import graphgen.generator.exceptions.InfeasibilityImpossibleException.InfeasibilityImpossibleCause;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleNodePlacer.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleNodePlacer.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.SeededRandom;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.InfeasibleConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.StartConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.InfeasibleConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.StartConfiguration;
 import graphgen.graph.LayerStructure;
 import graphgen.graph.ResourceNode;
 import graphgen.util.JavaUtils;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/configuration/InfeasibleConfiguration.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/configuration/InfeasibleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 import graphgen.graph.ResourceNode;
 import graphgen.util.JavaUtils;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/configuration/MinIICycleConfiguration.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/configuration/MinIICycleConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 import graphgen.graph.LayerStructure;
 import graphgen.graph.ResourceNode;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/configuration/StartConfiguration.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/configuration/StartConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;

src/main/java/graphgen/generator/components/properties/infeasibleMinII/configuration/SuffixConfiguration.java → src/main/java/graphgen/generator/components/properties/minII/infeasible/configuration/SuffixConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 import graphgen.generator.components.properties.util.PlannedEdge;
 import graphgen.graph.ResourceNode;

src/main/java/graphgen/main/Main.java

@@ -31,8 +31,8 @@ import graphgen.generator.components.layers.FixedShapeLayerCreator;
 import graphgen.generator.components.layers.LayerCreator;
 import graphgen.generator.components.nodes.DistributionNodeCreator;
 import graphgen.generator.components.nodes.NodeCreator;
-import graphgen.generator.components.properties.FeasibleMinIIProperty;
 import graphgen.generator.components.properties.Property;
+import graphgen.generator.components.properties.minII.feasible.FeasibleMinIIProperty;
 import graphgen.generator.util.distribution.Distribution;
 import graphgen.generator.util.distribution.ProbabilityDistribution;
 import graphgen.graph.Graph;

src/test/java/graphgen/generator/components/properties/FeasibleMinIIPropertyTest.java → src/test/java/graphgen/generator/components/properties/minII/feasible/FeasibleMinIIPropertyTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties;
+package graphgen.generator.components.properties.minII.feasible;
 
 import graphgen.datastructures.SeededRandom;
 import graphgen.enums.EdgeValue;
@@ -36,6 +36,7 @@ import graphgen.generator.components.layers.RandomShapeLayerCreator;
 import graphgen.generator.components.nodes.DistributionNodeCreator;
 import graphgen.generator.components.nodes.IdenticalNodeCreator;
 import graphgen.generator.components.nodes.NodeCreator;
+import graphgen.generator.components.properties.Property;
 import graphgen.generator.exceptions.MinIIImpossibleException;
 import graphgen.generator.util.distribution.DeterministicDistribution;
 import graphgen.generator.util.distribution.Distribution;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleCycleInspectorTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleCycleInspectorTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleEdgePlannerTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleEdgePlannerTest.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.Pair;
 import graphgen.datastructures.SeededRandom;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.InfeasibleConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.StartConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.SuffixConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.InfeasibleConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.StartConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.SuffixConfiguration;
 import graphgen.generator.components.properties.util.PlannedEdge;
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleMinIIPropertyTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleMinIIPropertyTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.SeededRandom;
 import graphgen.enums.ModuloSchedulingFormulation;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/InfeasibleNodePlacerTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/InfeasibleNodePlacerTest.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII;
+package graphgen.generator.components.properties.minII.infeasible;
 
 import graphgen.datastructures.SeededRandom;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.InfeasibleConfiguration;
-import graphgen.generator.components.properties.infeasibleMinII.configuration.StartConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.InfeasibleConfiguration;
+import graphgen.generator.components.properties.minII.infeasible.configuration.StartConfiguration;
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;
 import graphgen.graph.ResourceNode;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/configuration/InfeasibleConfigurationTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/configuration/InfeasibleConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 import graphgen.graph.LayerStructure;
 import graphgen.graph.Resource;

src/test/java/graphgen/generator/components/properties/infeasibleMinII/configuration/SuffixConfigurationTest.java → src/test/java/graphgen/generator/components/properties/minII/infeasible/configuration/SuffixConfigurationTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package graphgen.generator.components.properties.infeasibleMinII.configuration;
+package graphgen.generator.components.properties.minII.infeasible.configuration;
 
 
 import graphgen.generator.components.properties.util.PlannedEdge;