Skip to content

Commit

Permalink
[REFACTOR]: Changed add fields and methods from square to squared key
Browse files Browse the repository at this point in the history
  • Loading branch information
@gabrielmjr
gabrielmjr committed Oct 21, 2023
1 parent 0d667c5 commit f6fd882
Show file tree
Hide file tree
Showing 11 changed files with 1,234 additions and 1,234 deletions.
324 changes: 162 additions & 162 deletions src/main/java/com/mjr/code/physics/units/Acceleration.java
View file

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions src/main/java/com/mjr/code/physics/units/Area.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ public class Area extends Unit implements IArea {
@Deprecated
private static Area instance;

public static final int SQUARE_KILOMETER = Length.LAST_UNIT_CONS + 1;
public static final int SQUARE_HECTOMETER = Length.LAST_UNIT_CONS + 2;
public static final int SQUARE_DECAMETER = Length.LAST_UNIT_CONS + 3;
public static final int SQUARE_METER = Length.LAST_UNIT_CONS + 4;
public static final int SQUARE_DECIMETER = Length.LAST_UNIT_CONS + 5;
public static final int SQUARE_CENTIMETER = Length.LAST_UNIT_CONS + 6;
public static final int SQUARE_MILLIMETER = Length.LAST_UNIT_CONS + 7;

protected static final int UNIT_SCALE = SQUARE_KILOMETER;
protected static final int LAST_UNIT_CONS = SQUARE_MILLIMETER;
public static final int SQUARED_KILOMETER = Length.LAST_UNIT_CONS + 1;
public static final int SQUARED_HECTOMETER = Length.LAST_UNIT_CONS + 2;
public static final int SQUARED_DECAMETER = Length.LAST_UNIT_CONS + 3;
public static final int SQUARED_METER = Length.LAST_UNIT_CONS + 4;
public static final int SQUARED_DECIMETER = Length.LAST_UNIT_CONS + 5;
public static final int SQUARED_CENTIMETER = Length.LAST_UNIT_CONS + 6;
public static final int SQUARED_MILLIMETER = Length.LAST_UNIT_CONS + 7;

protected static final int UNIT_SCALE = SQUARED_KILOMETER;
protected static final int LAST_UNIT_CONS = SQUARED_MILLIMETER;
private final int MAX_UNIT_SCALE = LAST_UNIT_CONS - UNIT_SCALE;

protected static final BigDecimal[] AREA_SCALES = new BigDecimal[] {
Expand All @@ -33,52 +33,52 @@ public class Area extends Unit implements IArea {
LENGTH_SCALES[MILLIMETER].pow(2)
};

public static final String SQUARE_KILOMETER_SYMBOL = KILOMETER_SYMBOL + "²";
public static final String SQUARE_HECTOMETER_SYMBOL = HECTOMETER_SYMBOL + "²";
public static final String SQUARE_DECAMETER_SYMBOL = DECAMETER_SYMBOL + "²";
public static final String SQUARE_METER_SYMBOL = METER_SYMBOL + "²";
public static final String SQUARE_DECIMETER_SYMBOL = DECIMETER_SYMBOL + "²";
public static final String SQUARE_CENTIMETER_SYMBOL = CENTIMETER_SYMBOL + "²";
public static final String SQUARE_MILLIMETER_SYMBOL = MILLIMETER_SYMBOL + "²";
public static final String SQUARED_KILOMETER_SYMBOL = KILOMETER_SYMBOL + "²";
public static final String SQUARED_HECTOMETER_SYMBOL = HECTOMETER_SYMBOL + "²";
public static final String SQUARED_DECAMETER_SYMBOL = DECAMETER_SYMBOL + "²";
public static final String SQUARED_METER_SYMBOL = METER_SYMBOL + "²";
public static final String SQUARED_DECIMETER_SYMBOL = DECIMETER_SYMBOL + "²";
public static final String SQUARED_CENTIMETER_SYMBOL = CENTIMETER_SYMBOL + "²";
public static final String SQUARED_MILLIMETER_SYMBOL = MILLIMETER_SYMBOL + "²";

protected final String[] AREA_SYMBOLS = new String[] {
SQUARE_KILOMETER_SYMBOL,
SQUARE_HECTOMETER_SYMBOL,
SQUARE_DECAMETER_SYMBOL,
SQUARE_METER_SYMBOL,
SQUARE_DECIMETER_SYMBOL,
SQUARE_CENTIMETER_SYMBOL,
SQUARE_MILLIMETER_SYMBOL
SQUARED_KILOMETER_SYMBOL,
SQUARED_HECTOMETER_SYMBOL,
SQUARED_DECAMETER_SYMBOL,
SQUARED_METER_SYMBOL,
SQUARED_DECIMETER_SYMBOL,
SQUARED_CENTIMETER_SYMBOL,
SQUARED_MILLIMETER_SYMBOL
};

public Area() {
super();
setMaxUnit(MAX_UNIT_SCALE);
setUnit(SQUARE_METER - UNIT_SCALE);
setUnit(SQUARED_METER - UNIT_SCALE);
}

public Area(double value) {
super(value);
setMaxUnit(MAX_UNIT_SCALE);
setUnit(SQUARE_METER - UNIT_SCALE);
setUnit(SQUARED_METER - UNIT_SCALE);
}

public Area(String value) {
super(value);
setMaxUnit(MAX_UNIT_SCALE);
setUnit(SQUARE_METER - UNIT_SCALE);
setUnit(SQUARED_METER - UNIT_SCALE);
}

public Area(long value) {
super(value);
setMaxUnit(MAX_UNIT_SCALE);
setUnit(SQUARE_METER - UNIT_SCALE);
setUnit(SQUARED_METER - UNIT_SCALE);
}

public Area(BigDecimal value) {
super(value);
setMaxUnit(MAX_UNIT_SCALE);
setUnit(SQUARE_METER - UNIT_SCALE);
setUnit(SQUARED_METER - UNIT_SCALE);
}

public Area(double value, int unit) {
Expand Down Expand Up @@ -106,71 +106,71 @@ public Area(BigDecimal value, int unit) {
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareKilometer(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_KILOMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_KILOMETER);
public static @NotNull Area toSquaredKilometer(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_KILOMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_KILOMETER);
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareHectometer(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_HECTOMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_HECTOMETER);
public static @NotNull Area toSquaredHectometer(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_HECTOMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_HECTOMETER);
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareDecameter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_DECAMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_DECAMETER);
public static @NotNull Area toSquaredDecameter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_DECAMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_DECAMETER);
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareMeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_METER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_METER);
public static @NotNull Area toSquaredMeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_METER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_METER);
}
@Contract("_, _ -> new")
public static @NotNull Area toSquareDecimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_DECIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_DECIMETER);
public static @NotNull Area toSquaredDecimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_DECIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_DECIMETER);
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareCentimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_CENTIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_CENTIMETER);
public static @NotNull Area toSquaredCentimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_CENTIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_CENTIMETER);
}

@Contract("_, _ -> new")
public static @NotNull Area toSquareMillimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARE_MILLIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARE_MILLIMETER);
public static @NotNull Area toSquaredMillimeter(double value, int unit) {
return new Area(divide(multiply(value, AREA_SCALES[SQUARED_MILLIMETER - UNIT_SCALE]), AREA_SCALES[unit - UNIT_SCALE]), SQUARED_MILLIMETER);
}

@Override
public Area toSquareKilometer() {
public Area toSquaredKilometer() {
return null;
}

@Override
public Area toSquareHectometer() {
public Area toSquaredHectometer() {
return null;
}

@Override
public Area toSquareDecameter() {
public Area toSquaredDecameter() {
return null;
}

@Override
public Area toSquareMeter() {
public Area toSquaredMeter() {
return null;
}

@Override
public Area toSquareDecimeter() {
public Area toSquaredDecimeter() {
return null;
}

@Override
public Area toSquareCentimeter() {
public Area toSquaredCentimeter() {
return null;
}

@Override
public Area toSquareMillimeter() {
public Area toSquaredMillimeter() {
return null;
}

Expand All @@ -191,7 +191,7 @@ public boolean equals(Object object) {

@Override
public boolean isInInternationalSystem() {
return unit == (SQUARE_METER - UNIT_SCALE);
return unit == (SQUARED_METER - UNIT_SCALE);
}

@Override
Expand Down
44 changes: 22 additions & 22 deletions src/main/java/com/mjr/code/physics/units/IAcceleration.java
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
package com.mjr.code.physics.units;

public interface IAcceleration {
Acceleration toKilometerPerSquareSecond ();
Acceleration toHectometerPerSquareSecond ();
Acceleration toDecameterPerSquareSecond ();
Acceleration toMeterPerSquareSecond ();
Acceleration toDecimeterPerSquareSecond ();
Acceleration toCentimeterPerSquareSecond ();
Acceleration toMillimeterPerSquareSecond ();
Acceleration toKilometerPerSquaredSecond();
Acceleration toHectometerPerSquaredSecond();
Acceleration toDecameterPerSquaredSecond();
Acceleration toMeterPerSquaredSecond();
Acceleration toDecimeterPerSquaredSecond();
Acceleration toCentimeterPerSquaredSecond();
Acceleration toMillimeterPerSquaredSecond();

Acceleration toKilometerPerSquareMinute ();
Acceleration toHectometerPerSquareMinute ();
Acceleration toDecameterPerSquareMinute ();
Acceleration toMeterPerSquareMinute ();
Acceleration toDecimeterPerSquareMinute ();
Acceleration toCentimeterPerSquareMinute ();
Acceleration toMillimeterPerSquareMinute ();
Acceleration toKilometerPerSquaredMinute();
Acceleration toHectometerPerSquaredMinute();
Acceleration toDecameterPerSquaredMinute();
Acceleration toMeterPerSquaredMinute();
Acceleration toDecimeterPerSquaredMinute();
Acceleration toCentimeterPerSquaredMinute();
Acceleration toMillimeterPerSquaredMinute();

Acceleration toKilometerPerSquareHour ();
Acceleration toHectometerPerSquareHour ();
Acceleration toDecameterPerSquareHour ();
Acceleration toMeterPerSquareHour ();
Acceleration toDecimeterPerSquareHour ();
Acceleration toCentimeterPerSquareHour ();
Acceleration toMillimeterPerSquareHour ();
}
Acceleration toKilometerPerSquaredHour();
Acceleration toHectometerPerSquaredHour();
Acceleration toDecameterPerSquaredHour();
Acceleration toMeterPerSquaredHour();
Acceleration toDecimeterPerSquaredHour();
Acceleration toCentimeterPerSquaredHour();
Acceleration toMillimeterPerSquaredHour();
}
14 changes: 7 additions & 7 deletions src/main/java/com/mjr/code/physics/units/IArea.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.mjr.code.physics.units;

public interface IArea {
public abstract Area toSquareKilometer();
public abstract Area toSquareHectometer();
public abstract Area toSquareDecameter();
public abstract Area toSquareMeter();
public abstract Area toSquareDecimeter();
public abstract Area toSquareCentimeter();
public abstract Area toSquareMillimeter();
Area toSquaredKilometer();
Area toSquaredHectometer();
Area toSquaredDecameter();
Area toSquaredMeter();
Area toSquaredDecimeter();
Area toSquaredCentimeter();
Area toSquaredMillimeter();
}

10 changes: 5 additions & 5 deletions src/main/java/com/mjr/code/physics/units/ISquaredTime.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.mjr.code.physics.units;

public interface ISquaredTime {
SquaredTime toSquareSecond();
SquaredTime toSquareMinute();
SquaredTime toSquareHour();
SquaredTime toSquareDay();
SquaredTime toSquareWeek();
SquaredTime toSquaredSecond();
SquaredTime toSquaredMinute();
SquaredTime toSquaredHour();
SquaredTime toSquaredDay();
SquaredTime toSquaredWeek();
}
14 changes: 7 additions & 7 deletions src/main/java/com/mjr/code/physics/units/IVolume.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.mjr.code.physics.units;

public interface IVolume {
Volume toCubeKilometer ();
Volume toCubeHectometer ();
Volume toCubeDecameter ();
Volume toCubeMeter ();
Volume toCubeDecimeter ();
Volume toCubeCentimeter ();
Volume toCubeMillimeter ();
Volume toCubedKilometer();
Volume toCubedHectometer();
Volume toCubedDecameter();
Volume toCubedMeter();
Volume toCubedDecimeter();
Volume toCubedCentimeter();
Volume toCubedMillimeter();
}
Loading

0 comments on commit f6fd882

Please sign in to comment.