Renaming variables

McMaster-Baja-Racing · Dec 23, 2024 · d206438 · d206438
1 parent 0cc108b
commit d206438
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 37 deletions.
diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/AccelCurveAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/AccelCurveAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.exceptions.CsvException;
 import jakarta.enterprise.context.Dependent;
@@ -15,7 +15,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.ACCEL_CURVE)
+@AnalyzerTypeQualifier(AnalyzerType.ACCEL_CURVE)
 public class AccelCurveAnalyzer extends Analyzer {
 
   @Inject Logger logger;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/AnalyzerFactory.java b/backend/src/main/java/com/mcmasterbaja/analyzer/AnalyzerFactory.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.jboss.logging.Logger;
@@ -11,46 +11,46 @@ public class AnalyzerFactory {
   @Inject Logger logger;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.ACCEL_CURVE)
+  @AnalyzerTypeQualifier(AnalyzerType.ACCEL_CURVE)
   Analyzer accelCurveAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.AVERAGE)
+  @AnalyzerTypeQualifier(AnalyzerType.AVERAGE)
   Analyzer averageAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.CONSTANT_ADDER)
+  @AnalyzerTypeQualifier(AnalyzerType.CONSTANT_ADDER)
   Analyzer constantAdderAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.CUBIC)
+  @AnalyzerTypeQualifier(AnalyzerType.CUBIC)
   Analyzer cubicAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.INTERPOLATER_PRO)
+  @AnalyzerTypeQualifier(AnalyzerType.INTERPOLATER_PRO)
   Analyzer interpolaterProAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.LINEAR_MULTIPLY)
+  @AnalyzerTypeQualifier(AnalyzerType.LINEAR_MULTIPLY)
   Analyzer linearMultiplyAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.RDP_COMPRESSION)
+  @AnalyzerTypeQualifier(AnalyzerType.RDP_COMPRESSION)
   Analyzer rdpCompressionAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.ROLL_AVG)
+  @AnalyzerTypeQualifier(AnalyzerType.ROLL_AVG)
   Analyzer rollAvgAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.SGOLAY)
+  @AnalyzerTypeQualifier(AnalyzerType.SGOLAY)
   Analyzer sgolayAnalyzer;
 
   @Inject
-  @AnalyzerType(AnalyzerEnum.SPLIT)
+  @AnalyzerTypeQualifier(AnalyzerType.SPLIT)
   Analyzer splitAnalyzer;
 
-  public Analyzer createAnalyzer(AnalyzerEnum type) {
+  public Analyzer createAnalyzer(AnalyzerType type) {
     switch (type) {
       case ACCEL_CURVE:
         return accelCurveAnalyzer;

diff --git a/...m/mcmasterbaja/analyzer/AnalyzerType.java → ...rbaja/analyzer/AnalyzerTypeQualifier.java b/...m/mcmasterbaja/analyzer/AnalyzerType.java → ...rbaja/analyzer/AnalyzerTypeQualifier.java
@@ -3,14 +3,14 @@
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 @Qualifier
 @Retention(RUNTIME)
 @Target({TYPE, METHOD, FIELD, PARAMETER})
-public @interface AnalyzerType {
-  AnalyzerEnum value();
+public @interface AnalyzerTypeQualifier {
+  AnalyzerType value();
 }
diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/AverageAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/AverageAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -12,7 +12,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.AVERAGE)
+@AnalyzerTypeQualifier(AnalyzerType.AVERAGE)
 public class AverageAnalyzer extends Analyzer {
   // This class takes the average of a range of a column and returns it as a double
   @Inject Logger logger;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/ConstantAdderAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/ConstantAdderAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -11,7 +11,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.CONSTANT_ADDER)
+@AnalyzerTypeQualifier(AnalyzerType.CONSTANT_ADDER)
 public class ConstantAdderAnalyzer extends Analyzer {
   private double a;
   private double b;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/CubicAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/CubicAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -11,7 +11,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.CUBIC)
+@AnalyzerTypeQualifier(AnalyzerType.CUBIC)
 public class CubicAnalyzer extends Analyzer {
   // Form of y = ax^3 + bx^2 + cx + d
   private double a;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/InterpolaterProAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/InterpolaterProAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -18,7 +18,7 @@
 // file based on the timestamp
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.INTERPOLATER_PRO)
+@AnalyzerTypeQualifier(AnalyzerType.INTERPOLATER_PRO)
 public class InterpolaterProAnalyzer extends Analyzer {
 
   @Inject Logger logger;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/LinearMultiplyAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/LinearMultiplyAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -11,7 +11,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.LINEAR_MULTIPLY)
+@AnalyzerTypeQualifier(AnalyzerType.LINEAR_MULTIPLY)
 public class LinearMultiplyAnalyzer extends Analyzer {
   private double m;
   private double b;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/RDPCompressionAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/RDPCompressionAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -13,7 +13,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.RDP_COMPRESSION)
+@AnalyzerTypeQualifier(AnalyzerType.RDP_COMPRESSION)
 public class RDPCompressionAnalyzer extends Analyzer {
 
   // Epsilon is the maximum distance between a point and the line between the start and end points

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/RollingAvgAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/RollingAvgAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -13,7 +13,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.ROLL_AVG)
+@AnalyzerTypeQualifier(AnalyzerType.ROLL_AVG)
 public class RollingAvgAnalyzer extends Analyzer {
   private int windowSize;
   @Inject Logger logger;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/SGolayFilter.java b/backend/src/main/java/com/mcmasterbaja/analyzer/SGolayFilter.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -15,7 +15,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.SGOLAY)
+@AnalyzerTypeQualifier(AnalyzerType.SGOLAY)
 public class SGolayFilter extends Analyzer {
   private int windowSize;
   private int polynomialDegree;

diff --git a/backend/src/main/java/com/mcmasterbaja/analyzer/SplitAnalyzer.java b/backend/src/main/java/com/mcmasterbaja/analyzer/SplitAnalyzer.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.analyzer;
 
-import com.mcmasterbaja.model.AnalyzerEnum;
+import com.mcmasterbaja.model.AnalyzerType;
 import com.mcmasterbaja.model.AnalyzerParams;
 import com.opencsv.CSVReader;
 import com.opencsv.ICSVWriter;
@@ -11,7 +11,7 @@
 import org.jboss.logging.Logger;
 
 @Dependent
-@AnalyzerType(AnalyzerEnum.SPLIT)
+@AnalyzerTypeQualifier(AnalyzerType.SPLIT)
 public class SplitAnalyzer extends Analyzer {
   private int start;
   private int end;

diff --git a/backend/src/main/java/com/mcmasterbaja/model/AnalyzerParams.java b/backend/src/main/java/com/mcmasterbaja/model/AnalyzerParams.java
@@ -25,7 +25,7 @@ public class AnalyzerParams {
   private String[] inputColumns;
 
   @QueryParam("type")
-  private AnalyzerEnum type;
+  private AnalyzerType type;
 
   @QueryParam("analyzerOptions")
   private String[] options;

diff --git a/.../com/mcmasterbaja/model/AnalyzerEnum.java → .../com/mcmasterbaja/model/AnalyzerType.java b/.../com/mcmasterbaja/model/AnalyzerEnum.java → .../com/mcmasterbaja/model/AnalyzerType.java
@@ -1,6 +1,6 @@
 package com.mcmasterbaja.model;
 
-public enum AnalyzerEnum {
+public enum AnalyzerType {
   ACCEL_CURVE,
   AVERAGE,
   CUBIC,