From 8629ea34a93e8e0727982e68923873b46d9feb05 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Tue, 6 Jun 2023 19:29:21 +0200 Subject: [PATCH] chore: rename invariant to condition --- .../AbstractCondition.java} | 4 ++-- .../EquilateralTriangleCondition.java} | 6 +++--- .../RadiusCondition.java} | 6 +++--- .../TetrahedronCondition.java} | 12 ++++++------ .../ma2tetr/impl/TetrahedronMovingCalculator.java | 8 ++++---- .../ma2tetr/impl/TetrahedronScalingCalculator.java | 8 ++++---- src/main/java/ma2tetr/model/TetrahedronBuilder.java | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/ma2tetr/{invariant/AbstractInvariant.java => condition/AbstractCondition.java} (80%) rename src/main/java/ma2tetr/{invariant/EquilateralTriangleInvariant.java => condition/EquilateralTriangleCondition.java} (80%) rename src/main/java/ma2tetr/{invariant/RadiusInvariant.java => condition/RadiusCondition.java} (84%) rename src/main/java/ma2tetr/{invariant/TetrahedronInvariant.java => condition/TetrahedronCondition.java} (80%) diff --git a/src/main/java/ma2tetr/invariant/AbstractInvariant.java b/src/main/java/ma2tetr/condition/AbstractCondition.java similarity index 80% rename from src/main/java/ma2tetr/invariant/AbstractInvariant.java rename to src/main/java/ma2tetr/condition/AbstractCondition.java index 8e08847..c8f4708 100644 --- a/src/main/java/ma2tetr/invariant/AbstractInvariant.java +++ b/src/main/java/ma2tetr/condition/AbstractCondition.java @@ -1,6 +1,6 @@ -package ma2tetr.invariant; +package ma2tetr.condition; -public abstract class AbstractInvariant { +public abstract class AbstractCondition { private double accuracy = 0.00000000001; diff --git a/src/main/java/ma2tetr/invariant/EquilateralTriangleInvariant.java b/src/main/java/ma2tetr/condition/EquilateralTriangleCondition.java similarity index 80% rename from src/main/java/ma2tetr/invariant/EquilateralTriangleInvariant.java rename to src/main/java/ma2tetr/condition/EquilateralTriangleCondition.java index 15eabf4..0f21f9a 100644 --- a/src/main/java/ma2tetr/invariant/EquilateralTriangleInvariant.java +++ b/src/main/java/ma2tetr/condition/EquilateralTriangleCondition.java @@ -1,8 +1,8 @@ -package ma2tetr.invariant; +package ma2tetr.condition; import ma2tetr.model.Coords3D; -public class EquilateralTriangleInvariant extends AbstractInvariant { +public class EquilateralTriangleCondition extends AbstractCondition { private Coords3D p1; private Coords3D p2; @@ -12,7 +12,7 @@ public class EquilateralTriangleInvariant extends AbstractInvariant { private double len23; private double len13; - public EquilateralTriangleInvariant(Coords3D p1, Coords3D p2, Coords3D p3) { + public EquilateralTriangleCondition(Coords3D p1, Coords3D p2, Coords3D p3) { this.p1 = p1; this.p2 = p2; this.p3 = p3; diff --git a/src/main/java/ma2tetr/invariant/RadiusInvariant.java b/src/main/java/ma2tetr/condition/RadiusCondition.java similarity index 84% rename from src/main/java/ma2tetr/invariant/RadiusInvariant.java rename to src/main/java/ma2tetr/condition/RadiusCondition.java index dfe3b56..6a80361 100644 --- a/src/main/java/ma2tetr/invariant/RadiusInvariant.java +++ b/src/main/java/ma2tetr/condition/RadiusCondition.java @@ -1,16 +1,16 @@ -package ma2tetr.invariant; +package ma2tetr.condition; import java.util.Set; import ma2tetr.model.Coords3D; -public class RadiusInvariant extends AbstractInvariant { +public class RadiusCondition extends AbstractCondition { private Set points; private Coords3D center; private double radius; - public RadiusInvariant(Set points, Coords3D center, double radius) { + public RadiusCondition(Set points, Coords3D center, double radius) { this.points = points; this.center = center; this.radius = radius; diff --git a/src/main/java/ma2tetr/invariant/TetrahedronInvariant.java b/src/main/java/ma2tetr/condition/TetrahedronCondition.java similarity index 80% rename from src/main/java/ma2tetr/invariant/TetrahedronInvariant.java rename to src/main/java/ma2tetr/condition/TetrahedronCondition.java index 1965d4a..a48a881 100644 --- a/src/main/java/ma2tetr/invariant/TetrahedronInvariant.java +++ b/src/main/java/ma2tetr/condition/TetrahedronCondition.java @@ -1,9 +1,9 @@ -package ma2tetr.invariant; +package ma2tetr.condition; import ma2tetr.model.Coords3D; import ma2tetr.model.Tetrahedron; -public class TetrahedronInvariant extends AbstractInvariant { +public class TetrahedronCondition extends AbstractCondition { private Coords3D top; private Coords3D p1; @@ -15,17 +15,17 @@ public class TetrahedronInvariant extends AbstractInvariant { private double len3; private double lenbase; - private EquilateralTriangleInvariant base; + private EquilateralTriangleCondition base; - public TetrahedronInvariant(Coords3D top, Coords3D p1, Coords3D p2, Coords3D p3) { + public TetrahedronCondition(Coords3D top, Coords3D p1, Coords3D p2, Coords3D p3) { this.top = top; this.p1 = p1; this.p2 = p2; this.p3 = p3; - this.base = new EquilateralTriangleInvariant(p1, p2, p3); + this.base = new EquilateralTriangleCondition(p1, p2, p3); } - public TetrahedronInvariant(Tetrahedron t) { + public TetrahedronCondition(Tetrahedron t) { this(t.getTop(), t.getP1(), t.getP2(), t.getP3()); } diff --git a/src/main/java/ma2tetr/impl/TetrahedronMovingCalculator.java b/src/main/java/ma2tetr/impl/TetrahedronMovingCalculator.java index ac37d5f..23f29a8 100644 --- a/src/main/java/ma2tetr/impl/TetrahedronMovingCalculator.java +++ b/src/main/java/ma2tetr/impl/TetrahedronMovingCalculator.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Set; import ma2tetr.api.ITetrahedronCoordCalculator; -import ma2tetr.invariant.RadiusInvariant; -import ma2tetr.invariant.TetrahedronInvariant; +import ma2tetr.condition.RadiusCondition; +import ma2tetr.condition.TetrahedronCondition; import ma2tetr.model.Coords3D; import ma2tetr.model.IterationState; import ma2tetr.model.Point3D; @@ -38,9 +38,9 @@ public class TetrahedronMovingCalculator implements ITetrahedronCoordCalculator points.add(triangle.getP2()); points.add(triangle.getP3()); StateLogger logger = new StateLogger(center, points, log); - RadiusInvariant rinv = new RadiusInvariant(points, center, radius); + RadiusCondition rinv = new RadiusCondition(points, center, radius); rinv.setAccuracy(accuracy); - TetrahedronInvariant tinv = new TetrahedronInvariant(top, triangle.getP1(), triangle.getP2(), triangle.getP3()); + TetrahedronCondition tinv = new TetrahedronCondition(top, triangle.getP1(), triangle.getP2(), triangle.getP3()); tinv.setAccuracy(accuracy); double scaling = radius / 10; while(true) { diff --git a/src/main/java/ma2tetr/impl/TetrahedronScalingCalculator.java b/src/main/java/ma2tetr/impl/TetrahedronScalingCalculator.java index bf63b53..2dd2d89 100644 --- a/src/main/java/ma2tetr/impl/TetrahedronScalingCalculator.java +++ b/src/main/java/ma2tetr/impl/TetrahedronScalingCalculator.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import ma2tetr.api.ITetrahedronCoordCalculator; -import ma2tetr.invariant.RadiusInvariant; -import ma2tetr.invariant.TetrahedronInvariant; +import ma2tetr.condition.RadiusCondition; +import ma2tetr.condition.TetrahedronCondition; import ma2tetr.model.Coords3D; import ma2tetr.model.IterationState; import ma2tetr.model.Point3D; @@ -29,9 +29,9 @@ public class TetrahedronScalingCalculator implements ITetrahedronCoordCalculator Coords3D center = new Vector3D(0, 0, 0); tetrahedron = new Tetrahedron(new Point3D(0, radius, 0), accuracy); StateLogger logger = new StateLogger(center, tetrahedron.getPointsSet(), log); - TetrahedronInvariant tinv = new TetrahedronInvariant(tetrahedron); + TetrahedronCondition tinv = new TetrahedronCondition(tetrahedron); tinv.setAccuracy(accuracy); - RadiusInvariant rinv = new RadiusInvariant(tetrahedron.getPointsSet(), center, radius); + RadiusCondition rinv = new RadiusCondition(tetrahedron.getPointsSet(), center, radius); rinv.setAccuracy(accuracy); double scaling = radius / 10; while(true) { diff --git a/src/main/java/ma2tetr/model/TetrahedronBuilder.java b/src/main/java/ma2tetr/model/TetrahedronBuilder.java index df86680..847949e 100644 --- a/src/main/java/ma2tetr/model/TetrahedronBuilder.java +++ b/src/main/java/ma2tetr/model/TetrahedronBuilder.java @@ -1,6 +1,6 @@ package ma2tetr.model; -import ma2tetr.invariant.EquilateralTriangleInvariant; +import ma2tetr.condition.EquilateralTriangleCondition; public class TetrahedronBuilder { @@ -23,7 +23,7 @@ public class TetrahedronBuilder { p1 = trib.getP1(); p2 = trib.getP2(); p3 = trib.getP3(); - EquilateralTriangleInvariant inv = new EquilateralTriangleInvariant(p1, p2, p3); + EquilateralTriangleCondition inv = new EquilateralTriangleCondition(p1, p2, p3); inv.setAccuracy(accuracy); if (!inv.isFulfilled()) { throw new RuntimeException("Unexpected error");