diff --git a/.gitpod.yml b/.gitpod.yml index 4b208cd..6aecdbd 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ vscode: extensions: - - redhat.java@1.6.0 \ No newline at end of file + - redhat.java@1.2.0 \ No newline at end of file diff --git a/readers/DDRReader.java b/readers/DDRReader.java index e1fbe6c..f420a18 100644 --- a/readers/DDRReader.java +++ b/readers/DDRReader.java @@ -253,8 +253,8 @@ public class DDRReader extends Reader{ } @Override - String interpretOutput(String[] jp_data, String[] en_data) { + void interpretResults(String[] finalData) { // TODO Auto-generated method stub - return null; + } } \ No newline at end of file diff --git a/readers/LoveLiveReader.java b/readers/LoveLiveReader.java index e7724dd..ae133c7 100644 --- a/readers/LoveLiveReader.java +++ b/readers/LoveLiveReader.java @@ -13,7 +13,6 @@ import java.util.regex.Pattern; import javax.imageio.ImageIO; public class LoveLiveReader extends Reader{ - final static int REGION_PADDING = 32; List extraRegions = new ArrayList<>(); static int lastJump=0; public LoveLiveReader(){ @@ -250,68 +249,7 @@ public class LoveLiveReader extends Reader{ //System.out.println(data[2]); } - @Override - String interpretOutput(String[] jp_data,String[] en_data) { - //[6, 0, 218, 0, 218, 48, 6, 48, 32 5 4 1 5, 0.9670235803680689] - //For each data point we want to first see if it's within the correct rectangular bounds and from there parse it as such. - double[] accuracy = new double[readRegions.size()]; - String[] finalData = new String[readRegions.size()]; - for (int i=0;i=spacing&&midpoint<=spacing+readRegions.get(j).h+REGION_PADDING - /*&&accuracy[j]=spacing&&midpoint<=spacing+readRegions.get(j).h+REGION_PADDING - &&accuracy[j] extraRegions = new ArrayList<>(); static int lastJump=0; public PopnReader(){ @@ -189,8 +188,8 @@ public class PopnReader extends Reader{ } @Override - String interpretOutput(String[] jp_data, String[] en_data) { + void interpretResults(String[] finalData) { // TODO Auto-generated method stub - return null; + } } \ No newline at end of file diff --git a/readers/Reader.java b/readers/Reader.java index 99e659d..c16a52d 100644 --- a/readers/Reader.java +++ b/readers/Reader.java @@ -8,6 +8,7 @@ import java.util.List; import java.awt.Color; public abstract class Reader{ + final static int REGION_PADDING = 32; int score; int rank; int[] notes = new int[7]; @@ -41,7 +42,66 @@ public abstract class Reader{ } return ""; } - abstract String interpretOutput(String[] jp_data,String[] en_data); + String interpretOutput(String[] jp_data,String[] en_data) { + //[6, 0, 218, 0, 218, 48, 6, 48, 32 5 4 1 5, 0.9670235803680689] + //For each data point we want to first see if it's within the correct rectangular bounds and from there parse it as such. + double[] accuracy = new double[readRegions.size()]; + String[] finalData = new String[readRegions.size()]; + for (int i=0;i=spacing&&midpoint<=spacing+readRegions.get(j).h+REGION_PADDING + /*&&accuracy[j]=spacing&&midpoint<=spacing+readRegions.get(j).h+REGION_PADDING + &&accuracy[j]