diff --git a/build.gradle b/build.gradle index c93211d..63aabe3 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,8 @@ dependencies { testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } + compile 'org.apache.httpcomponents:httpcore:4.4.1' + compile 'org.apache.httpcomponents:httpclient:4.5' } test { diff --git a/lib/httpclient-4.5.12.jar b/lib/httpclient-4.5.12.jar new file mode 100644 index 0000000..300cdf0 Binary files /dev/null and b/lib/httpclient-4.5.12.jar differ diff --git a/lib/httpcore-4.4.13.jar b/lib/httpcore-4.4.13.jar new file mode 100644 index 0000000..163dc43 Binary files /dev/null and b/lib/httpcore-4.4.13.jar differ diff --git a/src/main/java/com/example/demo/Controller.java b/src/main/java/com/example/demo/Controller.java index b9a2fc5..deef47a 100644 --- a/src/main/java/com/example/demo/Controller.java +++ b/src/main/java/com/example/demo/Controller.java @@ -1,8 +1,17 @@ package com.example.demo; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.filter.CharacterEncodingFilter; @@ -20,6 +29,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.net.ConnectException; @@ -29,7 +39,11 @@ import java.net.URLDecoder; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Scanner; import javax.imageio.ImageIO; @@ -51,11 +65,73 @@ public class Controller { //r=128,g=5,b=232 return failPixel.getRed()>=50 && failPixel.getRed()<=150 && failPixel.getGreen()>=50 && failPixel.getGreen()<=150 && failPixel.getBlue()>=50 && failPixel.getBlue()<=150; } + + @PostMapping("/image") + public String postImage(@RequestParam Map body){ + HashMap data = new HashMap<>(); + if (body.containsKey("url") && body.containsKey("user") && body.containsKey("auth")) { + HashMap imageData = GetImageData(body.get("url")); + data.putAll(imageData); + data.put("user",body.get("user")); + data.put("auth",body.get("auth")); + //System.out.println("In here."); + HttpClient httpclient = HttpClients.createDefault(); + HttpPost httppost = new HttpPost("http://projectdivar.com/submit"); + + // Request parameters and other properties. + List params = new ArrayList(); + params.add(new BasicNameValuePair("song", data.get("songname"))); + params.add(new BasicNameValuePair("username", data.get("user"))); + params.add(new BasicNameValuePair("authentication_token", data.get("auth"))); + params.add(new BasicNameValuePair("difficulty", data.get("difficulty"))); + params.add(new BasicNameValuePair("cool", data.get("cool"))); + params.add(new BasicNameValuePair("fine", data.get("fine"))); + params.add(new BasicNameValuePair("safe", data.get("safe"))); + params.add(new BasicNameValuePair("sad", data.get("sad"))); + params.add(new BasicNameValuePair("worst", data.get("worst"))); + params.add(new BasicNameValuePair("percent", data.get("percent"))); + params.add(new BasicNameValuePair("fail", data.get("fail"))); + params.add(new BasicNameValuePair("combo", data.get("combo"))); + params.add(new BasicNameValuePair("mod", data.get("mod"))); + params.add(new BasicNameValuePair("gameScore", data.get("gameScore"))); + try { + httppost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Execute and get the response. + HttpResponse response = null; + try { + response = httpclient.execute(httppost); + } catch (IOException e) { + e.printStackTrace(); + } + HttpEntity entity = response.getEntity(); + String result = ""; + if (entity != null) { + try (InputStream instream = entity.getContent()) { + Scanner s = new Scanner(instream).useDelimiter("\\A"); + result = s.hasNext() ? s.next() : ""; + instream.close(); + } catch (UnsupportedOperationException | IOException e) { + e.printStackTrace(); + } + } + return result; + } + return "Invalid parameters!"; + } @GetMapping("/image") - public HashMap helloWorld(@RequestParam("url") String url){ + public HashMap getImage(@RequestParam("url") String url){ + return GetImageData(url); + } + + private HashMap GetImageData(String url) { HashMap data = new HashMap<>(); //System.out.println(new File(".").getAbsolutePath()); + //System.out.println(body); try { System.out.println(url); downloadFileFromUrl(url,"temp"); @@ -102,7 +178,7 @@ public class Controller { e.printStackTrace(); } return data; - } + } public static String getSongTitle(BufferedImage img) { final int THRESHOLD=1; diff --git a/src/main/java/sig/TypeFace.java b/src/main/java/sig/TypeFace.java index 719e49f..861243e 100644 --- a/src/main/java/sig/TypeFace.java +++ b/src/main/java/sig/TypeFace.java @@ -68,7 +68,7 @@ public class TypeFace { img.setRGB(x, y, Color.WHITE.getRGB()); } } else - if ((currentCol.getRed()>=0 && currentCol.getRed()<=100 + if ((currentCol.getRed()>=0 && currentCol.getRed()<=105 && currentCol.getGreen()>=0 && currentCol.getGreen()<=150 && currentCol.getBlue()>=0 && currentCol.getBlue()<=150) || (this.equals(DemoApplication.typeface2) && diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0d75d5a..6c204c7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ - +server.port=4503 # Charset of HTTP requests and responses. Added to the "Content-Type" header if not set explicitly. spring.http.encoding.charset=UTF-8 # Enable http encoding support. diff --git a/temp b/temp index 147aa13..0e62525 100644 Binary files a/temp and b/temp differ diff --git a/tmp/combo/0.txt b/tmp/combo/0.txt index dfd5a75..adff72c 100644 --- a/tmp/combo/0.txt +++ b/tmp/combo/0.txt @@ -1,10 +1,10 @@ -1:0.71875 -2:0.9296875 +1:0.71484375 +2:0.92578125 3:0.017578125 4:0.03125 5:0.0107421875 -6:0.07421875 +6:0.072265625 7:0.0078125 8:0.048828125 9:0.03125 -0:0.07421875 +0:0.072265625 diff --git a/tmp/combo/0_0.png b/tmp/combo/0_0.png index d426e45..36f65d4 100644 Binary files a/tmp/combo/0_0.png and b/tmp/combo/0_0.png differ diff --git a/tmp/combo/0_1.png b/tmp/combo/0_1.png index 2e0180b..04b0607 100644 Binary files a/tmp/combo/0_1.png and b/tmp/combo/0_1.png differ diff --git a/tmp/combo/0_2.png b/tmp/combo/0_2.png index d80e47a..da6b707 100644 Binary files a/tmp/combo/0_2.png and b/tmp/combo/0_2.png differ diff --git a/tmp/combo/0_3.png b/tmp/combo/0_3.png index cf221f3..5e43726 100644 Binary files a/tmp/combo/0_3.png and b/tmp/combo/0_3.png differ diff --git a/tmp/combo/0_4.png b/tmp/combo/0_4.png index 44b0439..3663a9b 100644 Binary files a/tmp/combo/0_4.png and b/tmp/combo/0_4.png differ diff --git a/tmp/combo/0_5.png b/tmp/combo/0_5.png index 72dc4b0..1c28e28 100644 Binary files a/tmp/combo/0_5.png and b/tmp/combo/0_5.png differ diff --git a/tmp/combo/0_6.png b/tmp/combo/0_6.png index c5c554e..131583b 100644 Binary files a/tmp/combo/0_6.png and b/tmp/combo/0_6.png differ diff --git a/tmp/combo/0_7.png b/tmp/combo/0_7.png index 79dbfa6..3597b6e 100644 Binary files a/tmp/combo/0_7.png and b/tmp/combo/0_7.png differ diff --git a/tmp/combo/0_8.png b/tmp/combo/0_8.png index 33cede1..f17c455 100644 Binary files a/tmp/combo/0_8.png and b/tmp/combo/0_8.png differ diff --git a/tmp/combo/0_9.png b/tmp/combo/0_9.png index 0e06cee..666075d 100644 Binary files a/tmp/combo/0_9.png and b/tmp/combo/0_9.png differ diff --git a/tmp/combo/1.txt b/tmp/combo/1.txt index a54bdbd..af2fbb3 100644 --- a/tmp/combo/1.txt +++ b/tmp/combo/1.txt @@ -1,10 +1,10 @@ -1:0.759765625 +1:0.5 2:0.0078125 3:0.00390625 -4:0.04296875 -5:0.0185546875 -6:0.9013671875 +4:0.826171875 +5:0.2373046875 +6:0.052734375 7:0.00390625 -8:0.76171875 -9:0.0390625 -0:0.400390625 +8:0.052734375 +9:0.1171875 +0:0.0703125 diff --git a/tmp/combo/1_0.png b/tmp/combo/1_0.png index 3ec53b2..ce29538 100644 Binary files a/tmp/combo/1_0.png and b/tmp/combo/1_0.png differ diff --git a/tmp/combo/1_1.png b/tmp/combo/1_1.png index 7eea960..bcbabbe 100644 Binary files a/tmp/combo/1_1.png and b/tmp/combo/1_1.png differ diff --git a/tmp/combo/1_2.png b/tmp/combo/1_2.png index 14d8cb9..9ad3f3a 100644 Binary files a/tmp/combo/1_2.png and b/tmp/combo/1_2.png differ diff --git a/tmp/combo/1_3.png b/tmp/combo/1_3.png index 9c73747..330efab 100644 Binary files a/tmp/combo/1_3.png and b/tmp/combo/1_3.png differ diff --git a/tmp/combo/1_4.png b/tmp/combo/1_4.png index d5f60a4..7274871 100644 Binary files a/tmp/combo/1_4.png and b/tmp/combo/1_4.png differ diff --git a/tmp/combo/1_5.png b/tmp/combo/1_5.png index 4fce6de..2e1cf60 100644 Binary files a/tmp/combo/1_5.png and b/tmp/combo/1_5.png differ diff --git a/tmp/combo/1_6.png b/tmp/combo/1_6.png index e598efe..0b18c63 100644 Binary files a/tmp/combo/1_6.png and b/tmp/combo/1_6.png differ diff --git a/tmp/combo/1_7.png b/tmp/combo/1_7.png index dc3837e..9af58c6 100644 Binary files a/tmp/combo/1_7.png and b/tmp/combo/1_7.png differ diff --git a/tmp/combo/1_8.png b/tmp/combo/1_8.png index fc3a06d..0b18c63 100644 Binary files a/tmp/combo/1_8.png and b/tmp/combo/1_8.png differ diff --git a/tmp/combo/1_9.png b/tmp/combo/1_9.png index 6dd093d..26b1b2d 100644 Binary files a/tmp/combo/1_9.png and b/tmp/combo/1_9.png differ diff --git a/tmp/combo/2.txt b/tmp/combo/2.txt index 9c3619c..6b3d0df 100644 --- a/tmp/combo/2.txt +++ b/tmp/combo/2.txt @@ -1,10 +1,10 @@ -1:0.74609375 +1:0.501953125 2:0.005859375 3:0.005859375 -4:0.041015625 -5:0.0166015625 -6:0.2802734375 -7:0.001953125 -8:0.326171875 -9:0.041015625 -0:0.95703125 +4:0.83984375 +5:0.2294921875 +6:0.044921875 +7:0.041015625 +8:0.044921875 +9:0.1171875 +0:0.0625 diff --git a/tmp/combo/2_0.png b/tmp/combo/2_0.png index d4311ea..f6fbcb3 100644 Binary files a/tmp/combo/2_0.png and b/tmp/combo/2_0.png differ diff --git a/tmp/combo/2_1.png b/tmp/combo/2_1.png index f812b15..5784ef0 100644 Binary files a/tmp/combo/2_1.png and b/tmp/combo/2_1.png differ diff --git a/tmp/combo/2_2.png b/tmp/combo/2_2.png index 7d693fc..c0e2cd4 100644 Binary files a/tmp/combo/2_2.png and b/tmp/combo/2_2.png differ diff --git a/tmp/combo/2_3.png b/tmp/combo/2_3.png index b262a79..d4261c2 100644 Binary files a/tmp/combo/2_3.png and b/tmp/combo/2_3.png differ diff --git a/tmp/combo/2_4.png b/tmp/combo/2_4.png index 8c3fd7b..fe5a2af 100644 Binary files a/tmp/combo/2_4.png and b/tmp/combo/2_4.png differ diff --git a/tmp/combo/2_5.png b/tmp/combo/2_5.png index dcfe8b2..15e8547 100644 Binary files a/tmp/combo/2_5.png and b/tmp/combo/2_5.png differ diff --git a/tmp/combo/2_6.png b/tmp/combo/2_6.png index 926ce68..30dc2b8 100644 Binary files a/tmp/combo/2_6.png and b/tmp/combo/2_6.png differ diff --git a/tmp/combo/2_7.png b/tmp/combo/2_7.png index 268960a..f279cc1 100644 Binary files a/tmp/combo/2_7.png and b/tmp/combo/2_7.png differ diff --git a/tmp/combo/2_8.png b/tmp/combo/2_8.png index 256b3dc..30dc2b8 100644 Binary files a/tmp/combo/2_8.png and b/tmp/combo/2_8.png differ diff --git a/tmp/combo/2_9.png b/tmp/combo/2_9.png index aa0ff6f..39f6a3e 100644 Binary files a/tmp/combo/2_9.png and b/tmp/combo/2_9.png differ diff --git a/tmp/combo/img.png b/tmp/combo/img.png index 32ac757..2ac69ee 100644 Binary files a/tmp/combo/img.png and b/tmp/combo/img.png differ diff --git a/tmp/cool/0.txt b/tmp/cool/0.txt index ca8c75d..2c74830 100644 --- a/tmp/cool/0.txt +++ b/tmp/cool/0.txt @@ -1,10 +1,10 @@ -1:0.77734375 -2:0.9296875 -3:0.013671875 -4:0.037109375 -5:0.0146484375 -6:0.08984375 -7:0.0078125 -8:0.0625 -9:0.029296875 -0:0.08984375 +1:0.53125 +2:0.0078125 +3:0.00390625 +4:0.787109375 +5:0.2353515625 +6:0.0546875 +7:0.00390625 +8:0.0546875 +9:0.111328125 +0:0.07421875 diff --git a/tmp/cool/0_0.png b/tmp/cool/0_0.png index 9dc9643..0be2e36 100644 Binary files a/tmp/cool/0_0.png and b/tmp/cool/0_0.png differ diff --git a/tmp/cool/0_1.png b/tmp/cool/0_1.png index 765f526..02dcc4f 100644 Binary files a/tmp/cool/0_1.png and b/tmp/cool/0_1.png differ diff --git a/tmp/cool/0_2.png b/tmp/cool/0_2.png index bcda54e..d3fb3ba 100644 Binary files a/tmp/cool/0_2.png and b/tmp/cool/0_2.png differ diff --git a/tmp/cool/0_3.png b/tmp/cool/0_3.png index 9c63ab5..bef887d 100644 Binary files a/tmp/cool/0_3.png and b/tmp/cool/0_3.png differ diff --git a/tmp/cool/0_4.png b/tmp/cool/0_4.png index ceaa031..f135d01 100644 Binary files a/tmp/cool/0_4.png and b/tmp/cool/0_4.png differ diff --git a/tmp/cool/0_5.png b/tmp/cool/0_5.png index b17c755..88da119 100644 Binary files a/tmp/cool/0_5.png and b/tmp/cool/0_5.png differ diff --git a/tmp/cool/0_6.png b/tmp/cool/0_6.png index 9dc9643..45b0fd9 100644 Binary files a/tmp/cool/0_6.png and b/tmp/cool/0_6.png differ diff --git a/tmp/cool/0_7.png b/tmp/cool/0_7.png index 4be0039..fcf8fa3 100644 Binary files a/tmp/cool/0_7.png and b/tmp/cool/0_7.png differ diff --git a/tmp/cool/0_8.png b/tmp/cool/0_8.png index 40bfbb3..45b0fd9 100644 Binary files a/tmp/cool/0_8.png and b/tmp/cool/0_8.png differ diff --git a/tmp/cool/0_9.png b/tmp/cool/0_9.png index 27fa821..9437e6f 100644 Binary files a/tmp/cool/0_9.png and b/tmp/cool/0_9.png differ diff --git a/tmp/cool/1.txt b/tmp/cool/1.txt index a4918d6..4705866 100644 --- a/tmp/cool/1.txt +++ b/tmp/cool/1.txt @@ -1,10 +1,10 @@ -1:0.828125 +1:0.537109375 2:0.005859375 3:0.005859375 -4:0.064453125 -5:0.744140625 -6:0.05859375 +4:0.80859375 +5:0.2314453125 +6:0.048828125 7:0.001953125 -8:0.05859375 -9:0.93359375 -0:0.0859375 +8:0.048828125 +9:0.119140625 +0:0.06640625 diff --git a/tmp/cool/1_0.png b/tmp/cool/1_0.png index 3f2b80b..3ae8b89 100644 Binary files a/tmp/cool/1_0.png and b/tmp/cool/1_0.png differ diff --git a/tmp/cool/1_1.png b/tmp/cool/1_1.png index ad28adc..4e5bd99 100644 Binary files a/tmp/cool/1_1.png and b/tmp/cool/1_1.png differ diff --git a/tmp/cool/1_2.png b/tmp/cool/1_2.png index 17f8928..c950ab9 100644 Binary files a/tmp/cool/1_2.png and b/tmp/cool/1_2.png differ diff --git a/tmp/cool/1_3.png b/tmp/cool/1_3.png index 701d3d0..7c8b8ea 100644 Binary files a/tmp/cool/1_3.png and b/tmp/cool/1_3.png differ diff --git a/tmp/cool/1_4.png b/tmp/cool/1_4.png index 63649f6..d5b687c 100644 Binary files a/tmp/cool/1_4.png and b/tmp/cool/1_4.png differ diff --git a/tmp/cool/1_5.png b/tmp/cool/1_5.png index 633260c..deb5554 100644 Binary files a/tmp/cool/1_5.png and b/tmp/cool/1_5.png differ diff --git a/tmp/cool/1_6.png b/tmp/cool/1_6.png index 5d2df05..1752adc 100644 Binary files a/tmp/cool/1_6.png and b/tmp/cool/1_6.png differ diff --git a/tmp/cool/1_7.png b/tmp/cool/1_7.png index c333331..b000c9f 100644 Binary files a/tmp/cool/1_7.png and b/tmp/cool/1_7.png differ diff --git a/tmp/cool/1_8.png b/tmp/cool/1_8.png index 5d2df05..1752adc 100644 Binary files a/tmp/cool/1_8.png and b/tmp/cool/1_8.png differ diff --git a/tmp/cool/1_9.png b/tmp/cool/1_9.png index 6961345..5139043 100644 Binary files a/tmp/cool/1_9.png and b/tmp/cool/1_9.png differ diff --git a/tmp/cool/2.txt b/tmp/cool/2.txt index b597d91..fdf5426 100644 --- a/tmp/cool/2.txt +++ b/tmp/cool/2.txt @@ -1,10 +1,10 @@ -1:0.76171875 -2:0.0078125 -3:0.00390625 -4:0.044921875 -5:0.0185546875 -6:0.2919921875 -7:0.00390625 -8:0.34375 -9:0.037109375 -0:0.99609375 +1:0.96484375 +2:0.005859375 +3:0.005859375 +4:0.04296875 +5:0.0166015625 +6:0.7333984375 +7:0.001953125 +8:0.83203125 +9:0.04296875 +0:0.34765625 diff --git a/tmp/cool/2_0.png b/tmp/cool/2_0.png index 0095452..8db28c9 100644 Binary files a/tmp/cool/2_0.png and b/tmp/cool/2_0.png differ diff --git a/tmp/cool/2_1.png b/tmp/cool/2_1.png index 4719947..289f388 100644 Binary files a/tmp/cool/2_1.png and b/tmp/cool/2_1.png differ diff --git a/tmp/cool/2_2.png b/tmp/cool/2_2.png index 9ed07b8..7e792e1 100644 Binary files a/tmp/cool/2_2.png and b/tmp/cool/2_2.png differ diff --git a/tmp/cool/2_3.png b/tmp/cool/2_3.png index 2b08f0b..e64a7a0 100644 Binary files a/tmp/cool/2_3.png and b/tmp/cool/2_3.png differ diff --git a/tmp/cool/2_4.png b/tmp/cool/2_4.png index e952814..0f7b935 100644 Binary files a/tmp/cool/2_4.png and b/tmp/cool/2_4.png differ diff --git a/tmp/cool/2_5.png b/tmp/cool/2_5.png index 8f2dcdd..6f2922c 100644 Binary files a/tmp/cool/2_5.png and b/tmp/cool/2_5.png differ diff --git a/tmp/cool/2_6.png b/tmp/cool/2_6.png index 798f143..cb3456e 100644 Binary files a/tmp/cool/2_6.png and b/tmp/cool/2_6.png differ diff --git a/tmp/cool/2_7.png b/tmp/cool/2_7.png index 9d55579..eb5de76 100644 Binary files a/tmp/cool/2_7.png and b/tmp/cool/2_7.png differ diff --git a/tmp/cool/2_8.png b/tmp/cool/2_8.png index 356fa52..30d0ea5 100644 Binary files a/tmp/cool/2_8.png and b/tmp/cool/2_8.png differ diff --git a/tmp/cool/2_9.png b/tmp/cool/2_9.png index 0925511..1b3a7c7 100644 Binary files a/tmp/cool/2_9.png and b/tmp/cool/2_9.png differ diff --git a/tmp/cool/img.png b/tmp/cool/img.png index 6f6122e..33aa47b 100644 Binary files a/tmp/cool/img.png and b/tmp/cool/img.png differ diff --git a/tmp/fine/0.txt b/tmp/fine/0.txt index 5ed25ca..ba18391 100644 --- a/tmp/fine/0.txt +++ b/tmp/fine/0.txt @@ -1,10 +1,10 @@ -1:0.984375 -2:0.005859375 -3:0.005859375 -4:0.04296875 -5:0.0166015625 -6:0.7392578125 -7:0.001953125 -8:0.8359375 -9:0.04296875 -0:0.34765625 +1:0.705078125 +2:0.046875 +3:0.8671875 +4:0.033203125 +5:0.0693359375 +6:0.037109375 +7:0.0126953125 +8:0.029296875 +9:0.064453125 +0:0.048828125 diff --git a/tmp/fine/0_0.png b/tmp/fine/0_0.png index b645d3b..cc95314 100644 Binary files a/tmp/fine/0_0.png and b/tmp/fine/0_0.png differ diff --git a/tmp/fine/0_1.png b/tmp/fine/0_1.png index 3aeab77..5fb1be7 100644 Binary files a/tmp/fine/0_1.png and b/tmp/fine/0_1.png differ diff --git a/tmp/fine/0_2.png b/tmp/fine/0_2.png index cb63c30..259f71f 100644 Binary files a/tmp/fine/0_2.png and b/tmp/fine/0_2.png differ diff --git a/tmp/fine/0_3.png b/tmp/fine/0_3.png index 958983a..a9ca1bb 100644 Binary files a/tmp/fine/0_3.png and b/tmp/fine/0_3.png differ diff --git a/tmp/fine/0_4.png b/tmp/fine/0_4.png index f8f1f00..14bf054 100644 Binary files a/tmp/fine/0_4.png and b/tmp/fine/0_4.png differ diff --git a/tmp/fine/0_5.png b/tmp/fine/0_5.png index fba5f76..9e9d38e 100644 Binary files a/tmp/fine/0_5.png and b/tmp/fine/0_5.png differ diff --git a/tmp/fine/0_6.png b/tmp/fine/0_6.png index 5589cf2..c210f03 100644 Binary files a/tmp/fine/0_6.png and b/tmp/fine/0_6.png differ diff --git a/tmp/fine/0_7.png b/tmp/fine/0_7.png index 3d81705..f499f6f 100644 Binary files a/tmp/fine/0_7.png and b/tmp/fine/0_7.png differ diff --git a/tmp/fine/0_8.png b/tmp/fine/0_8.png index 741d0da..3413333 100644 Binary files a/tmp/fine/0_8.png and b/tmp/fine/0_8.png differ diff --git a/tmp/fine/0_9.png b/tmp/fine/0_9.png index bd9d5fd..8f81456 100644 Binary files a/tmp/fine/0_9.png and b/tmp/fine/0_9.png differ diff --git a/tmp/fine/1.txt b/tmp/fine/1.txt index eda98dc..ee961ab 100644 --- a/tmp/fine/1.txt +++ b/tmp/fine/1.txt @@ -1,10 +1,10 @@ -1:0.748046875 -2:0.0078125 -3:0.00390625 -4:0.04296875 -5:0.0185546875 -6:0.2861328125 -7:0.00390625 -8:0.33203125 -9:0.0390625 -0:0.947265625 +1:0.72265625 +2:0.05859375 +3:0.865234375 +4:0.03515625 +5:0.0849609375 +6:0.052734375 +7:0.0087890625 +8:0.044921875 +9:0.068359375 +0:0.064453125 diff --git a/tmp/fine/1_0.png b/tmp/fine/1_0.png index 6df1ee3..de3f6a2 100644 Binary files a/tmp/fine/1_0.png and b/tmp/fine/1_0.png differ diff --git a/tmp/fine/1_1.png b/tmp/fine/1_1.png index 4fd56e5..fb67ff8 100644 Binary files a/tmp/fine/1_1.png and b/tmp/fine/1_1.png differ diff --git a/tmp/fine/1_2.png b/tmp/fine/1_2.png index a306334..58af134 100644 Binary files a/tmp/fine/1_2.png and b/tmp/fine/1_2.png differ diff --git a/tmp/fine/1_3.png b/tmp/fine/1_3.png index 3bf2263..476fc4e 100644 Binary files a/tmp/fine/1_3.png and b/tmp/fine/1_3.png differ diff --git a/tmp/fine/1_4.png b/tmp/fine/1_4.png index 9c95f6d..420b029 100644 Binary files a/tmp/fine/1_4.png and b/tmp/fine/1_4.png differ diff --git a/tmp/fine/1_5.png b/tmp/fine/1_5.png index cbe5fba..c8631e8 100644 Binary files a/tmp/fine/1_5.png and b/tmp/fine/1_5.png differ diff --git a/tmp/fine/1_6.png b/tmp/fine/1_6.png index 0e7cf69..efadbd4 100644 Binary files a/tmp/fine/1_6.png and b/tmp/fine/1_6.png differ diff --git a/tmp/fine/1_7.png b/tmp/fine/1_7.png index e0d557c..3ec0869 100644 Binary files a/tmp/fine/1_7.png and b/tmp/fine/1_7.png differ diff --git a/tmp/fine/1_8.png b/tmp/fine/1_8.png index 0c1c169..3fafea1 100644 Binary files a/tmp/fine/1_8.png and b/tmp/fine/1_8.png differ diff --git a/tmp/fine/1_9.png b/tmp/fine/1_9.png index b8e9def..a04a84d 100644 Binary files a/tmp/fine/1_9.png and b/tmp/fine/1_9.png differ diff --git a/tmp/fine/2.txt b/tmp/fine/2.txt deleted file mode 100644 index aa6d1bb..0000000 --- a/tmp/fine/2.txt +++ /dev/null @@ -1,10 +0,0 @@ -1:0.7802734375 -2:0.0078125 -3:0.00390625 -4:0.044921875 -5:0.8310546875 -6:0.0673828125 -7:0.00390625 -8:0.0673828125 -9:0.8623046875 -0:0.091796875 diff --git a/tmp/fine/2_0.png b/tmp/fine/2_0.png deleted file mode 100644 index 2cf43bb..0000000 Binary files a/tmp/fine/2_0.png and /dev/null differ diff --git a/tmp/fine/2_1.png b/tmp/fine/2_1.png deleted file mode 100644 index 384f8de..0000000 Binary files a/tmp/fine/2_1.png and /dev/null differ diff --git a/tmp/fine/2_2.png b/tmp/fine/2_2.png deleted file mode 100644 index 5dd2581..0000000 Binary files a/tmp/fine/2_2.png and /dev/null differ diff --git a/tmp/fine/2_3.png b/tmp/fine/2_3.png deleted file mode 100644 index 8f63a3c..0000000 Binary files a/tmp/fine/2_3.png and /dev/null differ diff --git a/tmp/fine/2_4.png b/tmp/fine/2_4.png deleted file mode 100644 index 544272c..0000000 Binary files a/tmp/fine/2_4.png and /dev/null differ diff --git a/tmp/fine/2_5.png b/tmp/fine/2_5.png deleted file mode 100644 index 150942d..0000000 Binary files a/tmp/fine/2_5.png and /dev/null differ diff --git a/tmp/fine/2_6.png b/tmp/fine/2_6.png deleted file mode 100644 index 5765592..0000000 Binary files a/tmp/fine/2_6.png and /dev/null differ diff --git a/tmp/fine/2_7.png b/tmp/fine/2_7.png deleted file mode 100644 index 58c6b51..0000000 Binary files a/tmp/fine/2_7.png and /dev/null differ diff --git a/tmp/fine/2_8.png b/tmp/fine/2_8.png deleted file mode 100644 index 5765592..0000000 Binary files a/tmp/fine/2_8.png and /dev/null differ diff --git a/tmp/fine/2_9.png b/tmp/fine/2_9.png deleted file mode 100644 index ed41b77..0000000 Binary files a/tmp/fine/2_9.png and /dev/null differ diff --git a/tmp/fine/img.png b/tmp/fine/img.png index 5b15b67..f640e72 100644 Binary files a/tmp/fine/img.png and b/tmp/fine/img.png differ diff --git a/tmp/image.png b/tmp/image.png deleted file mode 100644 index b8bfa4e..0000000 Binary files a/tmp/image.png and /dev/null differ diff --git a/tmp/percent/0.txt b/tmp/percent/0.txt index f8755fd..7ad9c7a 100644 --- a/tmp/percent/0.txt +++ b/tmp/percent/0.txt @@ -1,10 +1,10 @@ -1:0.353515625 -2:0.0400390625 -3:0.03515625 -4:0.009765625 -5:0.6708984375 -6:0.0927734375 -7:0.015625 -8:0.0654296875 -9:0.8037109375 -0:0.0908203125 +1:0.60546875 +2:0.060546875 +3:0.08203125 +4:0.048828125 +5:0.0390625 +6:0.0390625 +7:0.337890625 +8:0.0439453125 +9:0.0419921875 +0:0.013671875 diff --git a/tmp/percent/0_0.png b/tmp/percent/0_0.png index 06fd77b..002f4fd 100644 Binary files a/tmp/percent/0_0.png and b/tmp/percent/0_0.png differ diff --git a/tmp/percent/0_1.png b/tmp/percent/0_1.png index d50be01..aff1037 100644 Binary files a/tmp/percent/0_1.png and b/tmp/percent/0_1.png differ diff --git a/tmp/percent/0_2.png b/tmp/percent/0_2.png index ae52268..bb426f5 100644 Binary files a/tmp/percent/0_2.png and b/tmp/percent/0_2.png differ diff --git a/tmp/percent/0_3.png b/tmp/percent/0_3.png index b04e9cb..4a8d1c0 100644 Binary files a/tmp/percent/0_3.png and b/tmp/percent/0_3.png differ diff --git a/tmp/percent/0_4.png b/tmp/percent/0_4.png index ec2bd93..57d184e 100644 Binary files a/tmp/percent/0_4.png and b/tmp/percent/0_4.png differ diff --git a/tmp/percent/0_5.png b/tmp/percent/0_5.png index c40e991..f69c4cd 100644 Binary files a/tmp/percent/0_5.png and b/tmp/percent/0_5.png differ diff --git a/tmp/percent/0_6.png b/tmp/percent/0_6.png index 90a1309..6cb91c6 100644 Binary files a/tmp/percent/0_6.png and b/tmp/percent/0_6.png differ diff --git a/tmp/percent/0_7.png b/tmp/percent/0_7.png index fd45b34..f512019 100644 Binary files a/tmp/percent/0_7.png and b/tmp/percent/0_7.png differ diff --git a/tmp/percent/0_8.png b/tmp/percent/0_8.png index d64801a..ae06950 100644 Binary files a/tmp/percent/0_8.png and b/tmp/percent/0_8.png differ diff --git a/tmp/percent/0_9.png b/tmp/percent/0_9.png index 1e5b9af..e279fd2 100644 Binary files a/tmp/percent/0_9.png and b/tmp/percent/0_9.png differ diff --git a/tmp/percent/1.txt b/tmp/percent/1.txt index 8228acb..9404c68 100644 --- a/tmp/percent/1.txt +++ b/tmp/percent/1.txt @@ -1,10 +1,10 @@ -1:0.4560546875 -2:0.0732421875 -3:0.0576171875 -4:0.80859375 -5:0.0341796875 -6:0.0595703125 -7:0.0087890625 -8:0.064453125 -9:0.00390625 -0:0.015625 +1:0.34765625 +2:0.04296875 +3:0.0302734375 +4:0.0029296875 +5:0.015625 +6:0.1904296875 +7:0.009765625 +8:0.208984375 +9:0.0146484375 +0:0.8916015625 diff --git a/tmp/percent/1_0.png b/tmp/percent/1_0.png index 357904d..f5aea0f 100644 Binary files a/tmp/percent/1_0.png and b/tmp/percent/1_0.png differ diff --git a/tmp/percent/1_1.png b/tmp/percent/1_1.png index d1a6437..1266abf 100644 Binary files a/tmp/percent/1_1.png and b/tmp/percent/1_1.png differ diff --git a/tmp/percent/1_2.png b/tmp/percent/1_2.png index 0779e13..986230b 100644 Binary files a/tmp/percent/1_2.png and b/tmp/percent/1_2.png differ diff --git a/tmp/percent/1_3.png b/tmp/percent/1_3.png index 9cc115e..8f3bc0a 100644 Binary files a/tmp/percent/1_3.png and b/tmp/percent/1_3.png differ diff --git a/tmp/percent/1_4.png b/tmp/percent/1_4.png index d02bbb9..1b274d6 100644 Binary files a/tmp/percent/1_4.png and b/tmp/percent/1_4.png differ diff --git a/tmp/percent/1_5.png b/tmp/percent/1_5.png index 9d24a57..7167fb9 100644 Binary files a/tmp/percent/1_5.png and b/tmp/percent/1_5.png differ diff --git a/tmp/percent/1_6.png b/tmp/percent/1_6.png index c3f804b..c6b1f42 100644 Binary files a/tmp/percent/1_6.png and b/tmp/percent/1_6.png differ diff --git a/tmp/percent/1_7.png b/tmp/percent/1_7.png index 09d7b49..78f5ee6 100644 Binary files a/tmp/percent/1_7.png and b/tmp/percent/1_7.png differ diff --git a/tmp/percent/1_8.png b/tmp/percent/1_8.png index 932accb..ace60a3 100644 Binary files a/tmp/percent/1_8.png and b/tmp/percent/1_8.png differ diff --git a/tmp/percent/1_9.png b/tmp/percent/1_9.png index 17175f9..4f809c6 100644 Binary files a/tmp/percent/1_9.png and b/tmp/percent/1_9.png differ diff --git a/tmp/percent/2.txt b/tmp/percent/2.txt index 83d5ed3..ff269b0 100644 --- a/tmp/percent/2.txt +++ b/tmp/percent/2.txt @@ -1,10 +1,10 @@ -1:0.30078125 -2:0.0419921875 -3:0.029296875 -4:0.0 -5:0.0166015625 -6:0.796875 +1:0.4462890625 +2:0.8525390625 +3:0.1455078125 +4:0.0546875 +5:0.0703125 +6:0.087890625 7:0.0107421875 -8:0.6875 -9:0.015625 -0:0.365234375 +8:0.060546875 +9:0.0341796875 +0:0.04296875 diff --git a/tmp/percent/2_0.png b/tmp/percent/2_0.png index fba31d3..3c10f15 100644 Binary files a/tmp/percent/2_0.png and b/tmp/percent/2_0.png differ diff --git a/tmp/percent/2_1.png b/tmp/percent/2_1.png index d4f535e..cbebe1c 100644 Binary files a/tmp/percent/2_1.png and b/tmp/percent/2_1.png differ diff --git a/tmp/percent/2_2.png b/tmp/percent/2_2.png index 2f74eaf..b35f5c8 100644 Binary files a/tmp/percent/2_2.png and b/tmp/percent/2_2.png differ diff --git a/tmp/percent/2_3.png b/tmp/percent/2_3.png index 1c531d9..dd7d845 100644 Binary files a/tmp/percent/2_3.png and b/tmp/percent/2_3.png differ diff --git a/tmp/percent/2_4.png b/tmp/percent/2_4.png index 2c399ac..92c0a45 100644 Binary files a/tmp/percent/2_4.png and b/tmp/percent/2_4.png differ diff --git a/tmp/percent/2_5.png b/tmp/percent/2_5.png index aafbd0b..49b28de 100644 Binary files a/tmp/percent/2_5.png and b/tmp/percent/2_5.png differ diff --git a/tmp/percent/2_6.png b/tmp/percent/2_6.png index fbdddba..d8bd9e6 100644 Binary files a/tmp/percent/2_6.png and b/tmp/percent/2_6.png differ diff --git a/tmp/percent/2_7.png b/tmp/percent/2_7.png index 14bcf18..5d24067 100644 Binary files a/tmp/percent/2_7.png and b/tmp/percent/2_7.png differ diff --git a/tmp/percent/2_8.png b/tmp/percent/2_8.png index 0184afd..5178444 100644 Binary files a/tmp/percent/2_8.png and b/tmp/percent/2_8.png differ diff --git a/tmp/percent/2_9.png b/tmp/percent/2_9.png index 47a9936..c97e23e 100644 Binary files a/tmp/percent/2_9.png and b/tmp/percent/2_9.png differ diff --git a/tmp/percent/3.txt b/tmp/percent/3.txt index c4305d0..4374c63 100644 --- a/tmp/percent/3.txt +++ b/tmp/percent/3.txt @@ -1,10 +1,10 @@ -1:0.4560546875 -2:0.0732421875 -3:0.0576171875 -4:0.806640625 -5:0.0341796875 -6:0.0595703125 -7:0.0087890625 -8:0.064453125 -9:0.00390625 -0:0.015625 +1:0.62109375 +2:0.0546875 +3:0.083984375 +4:0.056640625 +5:0.029296875 +6:0.04296875 +7:0.3515625 +8:0.0458984375 +9:0.0361328125 +0:0.013671875 diff --git a/tmp/percent/3_0.png b/tmp/percent/3_0.png index b031a7f..5e22808 100644 Binary files a/tmp/percent/3_0.png and b/tmp/percent/3_0.png differ diff --git a/tmp/percent/3_1.png b/tmp/percent/3_1.png index 386d694..16f8932 100644 Binary files a/tmp/percent/3_1.png and b/tmp/percent/3_1.png differ diff --git a/tmp/percent/3_2.png b/tmp/percent/3_2.png index 310d5b1..41fd59e 100644 Binary files a/tmp/percent/3_2.png and b/tmp/percent/3_2.png differ diff --git a/tmp/percent/3_3.png b/tmp/percent/3_3.png index 76edfee..9bf5680 100644 Binary files a/tmp/percent/3_3.png and b/tmp/percent/3_3.png differ diff --git a/tmp/percent/3_4.png b/tmp/percent/3_4.png index 7d6d06a..4098fc0 100644 Binary files a/tmp/percent/3_4.png and b/tmp/percent/3_4.png differ diff --git a/tmp/percent/3_5.png b/tmp/percent/3_5.png index 3aa3cd6..c6cb4cf 100644 Binary files a/tmp/percent/3_5.png and b/tmp/percent/3_5.png differ diff --git a/tmp/percent/3_6.png b/tmp/percent/3_6.png index c7001b5..e06645b 100644 Binary files a/tmp/percent/3_6.png and b/tmp/percent/3_6.png differ diff --git a/tmp/percent/3_7.png b/tmp/percent/3_7.png index 75da386..6e30628 100644 Binary files a/tmp/percent/3_7.png and b/tmp/percent/3_7.png differ diff --git a/tmp/percent/3_8.png b/tmp/percent/3_8.png index bddc442..d51820a 100644 Binary files a/tmp/percent/3_8.png and b/tmp/percent/3_8.png differ diff --git a/tmp/percent/3_9.png b/tmp/percent/3_9.png index 1264988..4e51aff 100644 Binary files a/tmp/percent/3_9.png and b/tmp/percent/3_9.png differ diff --git a/tmp/percent/4.txt b/tmp/percent/4.txt new file mode 100644 index 0000000..24408ca --- /dev/null +++ b/tmp/percent/4.txt @@ -0,0 +1,10 @@ +1:0.62109375 +2:0.056640625 +3:0.0859375 +4:0.0546875 +5:0.03125 +6:0.041015625 +7:0.34765625 +8:0.0478515625 +9:0.0341796875 +0:0.01171875 diff --git a/tmp/percent/4_0.png b/tmp/percent/4_0.png new file mode 100644 index 0000000..c41896d Binary files /dev/null and b/tmp/percent/4_0.png differ diff --git a/tmp/percent/4_1.png b/tmp/percent/4_1.png new file mode 100644 index 0000000..e18c846 Binary files /dev/null and b/tmp/percent/4_1.png differ diff --git a/tmp/percent/4_2.png b/tmp/percent/4_2.png new file mode 100644 index 0000000..476419b Binary files /dev/null and b/tmp/percent/4_2.png differ diff --git a/tmp/percent/4_3.png b/tmp/percent/4_3.png new file mode 100644 index 0000000..9266c3d Binary files /dev/null and b/tmp/percent/4_3.png differ diff --git a/tmp/percent/4_4.png b/tmp/percent/4_4.png new file mode 100644 index 0000000..a5417e8 Binary files /dev/null and b/tmp/percent/4_4.png differ diff --git a/tmp/percent/4_5.png b/tmp/percent/4_5.png new file mode 100644 index 0000000..4ce18af Binary files /dev/null and b/tmp/percent/4_5.png differ diff --git a/tmp/percent/4_6.png b/tmp/percent/4_6.png new file mode 100644 index 0000000..7998e20 Binary files /dev/null and b/tmp/percent/4_6.png differ diff --git a/tmp/percent/4_7.png b/tmp/percent/4_7.png new file mode 100644 index 0000000..2402e10 Binary files /dev/null and b/tmp/percent/4_7.png differ diff --git a/tmp/percent/4_8.png b/tmp/percent/4_8.png new file mode 100644 index 0000000..071dbde Binary files /dev/null and b/tmp/percent/4_8.png differ diff --git a/tmp/percent/4_9.png b/tmp/percent/4_9.png new file mode 100644 index 0000000..2e3e82d Binary files /dev/null and b/tmp/percent/4_9.png differ diff --git a/tmp/percent/img.png b/tmp/percent/img.png index 6d3d955..af3cb74 100644 Binary files a/tmp/percent/img.png and b/tmp/percent/img.png differ diff --git a/tmp/sad/0.txt b/tmp/sad/0.txt index 9fdc60a..b590333 100644 --- a/tmp/sad/0.txt +++ b/tmp/sad/0.txt @@ -1,10 +1,10 @@ -1:0.71875 +1:0.984375 2:0.0078125 3:0.00390625 4:0.044921875 5:0.0185546875 -6:0.2900390625 +6:0.7587890625 7:0.00390625 -8:0.333984375 +8:0.85546875 9:0.037109375 -0:0.9453125 +0:0.3671875 diff --git a/tmp/sad/0_0.png b/tmp/sad/0_0.png index fa51d73..a1056a8 100644 Binary files a/tmp/sad/0_0.png and b/tmp/sad/0_0.png differ diff --git a/tmp/sad/0_1.png b/tmp/sad/0_1.png index 50ad162..8ba3237 100644 Binary files a/tmp/sad/0_1.png and b/tmp/sad/0_1.png differ diff --git a/tmp/sad/0_2.png b/tmp/sad/0_2.png index 23980b5..b1a73be 100644 Binary files a/tmp/sad/0_2.png and b/tmp/sad/0_2.png differ diff --git a/tmp/sad/0_3.png b/tmp/sad/0_3.png index 98cb5a4..9957c97 100644 Binary files a/tmp/sad/0_3.png and b/tmp/sad/0_3.png differ diff --git a/tmp/sad/0_4.png b/tmp/sad/0_4.png index a38c602..35a6414 100644 Binary files a/tmp/sad/0_4.png and b/tmp/sad/0_4.png differ diff --git a/tmp/sad/0_5.png b/tmp/sad/0_5.png index 970b4b1..c4dadb9 100644 Binary files a/tmp/sad/0_5.png and b/tmp/sad/0_5.png differ diff --git a/tmp/sad/0_6.png b/tmp/sad/0_6.png index fa86ffa..3ec419a 100644 Binary files a/tmp/sad/0_6.png and b/tmp/sad/0_6.png differ diff --git a/tmp/sad/0_7.png b/tmp/sad/0_7.png index f97107d..540f7c6 100644 Binary files a/tmp/sad/0_7.png and b/tmp/sad/0_7.png differ diff --git a/tmp/sad/0_8.png b/tmp/sad/0_8.png index 27293f4..bcf9a68 100644 Binary files a/tmp/sad/0_8.png and b/tmp/sad/0_8.png differ diff --git a/tmp/sad/0_9.png b/tmp/sad/0_9.png index 7f97511..d711a6a 100644 Binary files a/tmp/sad/0_9.png and b/tmp/sad/0_9.png differ diff --git a/tmp/sad/img.png b/tmp/sad/img.png index 069733e..dd13dc9 100644 Binary files a/tmp/sad/img.png and b/tmp/sad/img.png differ diff --git a/tmp/safe/0.txt b/tmp/safe/0.txt index a6a1e2c..42a125b 100644 --- a/tmp/safe/0.txt +++ b/tmp/safe/0.txt @@ -1,10 +1,10 @@ -1:0.94140625 +1:0.744140625 2:0.0078125 3:0.00390625 4:0.04296875 5:0.0185546875 -6:0.7236328125 +6:0.255859375 7:0.00390625 -8:0.8203125 +8:0.330078125 9:0.0390625 -0:0.345703125 +0:0.978515625 diff --git a/tmp/safe/0_0.png b/tmp/safe/0_0.png index 4c9324e..0087bb5 100644 Binary files a/tmp/safe/0_0.png and b/tmp/safe/0_0.png differ diff --git a/tmp/safe/0_1.png b/tmp/safe/0_1.png index a2473e2..d2f3c84 100644 Binary files a/tmp/safe/0_1.png and b/tmp/safe/0_1.png differ diff --git a/tmp/safe/0_2.png b/tmp/safe/0_2.png index fc0de96..bd3962a 100644 Binary files a/tmp/safe/0_2.png and b/tmp/safe/0_2.png differ diff --git a/tmp/safe/0_3.png b/tmp/safe/0_3.png index 4bbd824..ed94d19 100644 Binary files a/tmp/safe/0_3.png and b/tmp/safe/0_3.png differ diff --git a/tmp/safe/0_4.png b/tmp/safe/0_4.png index 4377bb8..6b7ecca 100644 Binary files a/tmp/safe/0_4.png and b/tmp/safe/0_4.png differ diff --git a/tmp/safe/0_5.png b/tmp/safe/0_5.png index f01f09e..4247109 100644 Binary files a/tmp/safe/0_5.png and b/tmp/safe/0_5.png differ diff --git a/tmp/safe/0_6.png b/tmp/safe/0_6.png index b37d5ad..6f60048 100644 Binary files a/tmp/safe/0_6.png and b/tmp/safe/0_6.png differ diff --git a/tmp/safe/0_7.png b/tmp/safe/0_7.png index 32fda12..8629fbb 100644 Binary files a/tmp/safe/0_7.png and b/tmp/safe/0_7.png differ diff --git a/tmp/safe/0_8.png b/tmp/safe/0_8.png index f117666..e7b7fb1 100644 Binary files a/tmp/safe/0_8.png and b/tmp/safe/0_8.png differ diff --git a/tmp/safe/0_9.png b/tmp/safe/0_9.png index 72dc872..8b17fbf 100644 Binary files a/tmp/safe/0_9.png and b/tmp/safe/0_9.png differ diff --git a/tmp/safe/img.png b/tmp/safe/img.png index 60f1cca..8eb6351 100644 Binary files a/tmp/safe/img.png and b/tmp/safe/img.png differ diff --git a/tmp/score/0.txt b/tmp/score/0.txt index 2aedf60..1964424 100644 --- a/tmp/score/0.txt +++ b/tmp/score/0.txt @@ -1,10 +1,10 @@ -1:0.7490234375 -2:0.06640625 -3:0.8759765625 -4:0.033203125 -5:0.0771484375 -6:0.0546875 -7:0.009765625 -8:0.0478515625 -9:0.06640625 -0:0.068359375 +1:0.7841796875 +2:0.0078125 +3:0.00390625 +4:0.044921875 +5:0.0185546875 +6:0.904296875 +7:0.00390625 +8:0.7294921875 +9:0.037109375 +0:0.4052734375 diff --git a/tmp/score/0_0.png b/tmp/score/0_0.png index ba4adf8..f0cec3f 100644 Binary files a/tmp/score/0_0.png and b/tmp/score/0_0.png differ diff --git a/tmp/score/0_1.png b/tmp/score/0_1.png index 3e510e0..a62f653 100644 Binary files a/tmp/score/0_1.png and b/tmp/score/0_1.png differ diff --git a/tmp/score/0_2.png b/tmp/score/0_2.png index f60b67a..f786a8a 100644 Binary files a/tmp/score/0_2.png and b/tmp/score/0_2.png differ diff --git a/tmp/score/0_3.png b/tmp/score/0_3.png index b773293..9521046 100644 Binary files a/tmp/score/0_3.png and b/tmp/score/0_3.png differ diff --git a/tmp/score/0_4.png b/tmp/score/0_4.png index 0177203..b33fd5f 100644 Binary files a/tmp/score/0_4.png and b/tmp/score/0_4.png differ diff --git a/tmp/score/0_5.png b/tmp/score/0_5.png index 9cd7cf4..b8cf622 100644 Binary files a/tmp/score/0_5.png and b/tmp/score/0_5.png differ diff --git a/tmp/score/0_6.png b/tmp/score/0_6.png index 4669be8..a59dc15 100644 Binary files a/tmp/score/0_6.png and b/tmp/score/0_6.png differ diff --git a/tmp/score/0_7.png b/tmp/score/0_7.png index f38b083..11690d2 100644 Binary files a/tmp/score/0_7.png and b/tmp/score/0_7.png differ diff --git a/tmp/score/0_8.png b/tmp/score/0_8.png index 4cb7de1..4178bab 100644 Binary files a/tmp/score/0_8.png and b/tmp/score/0_8.png differ diff --git a/tmp/score/0_9.png b/tmp/score/0_9.png index e7838c6..bfa7406 100644 Binary files a/tmp/score/0_9.png and b/tmp/score/0_9.png differ diff --git a/tmp/score/1.txt b/tmp/score/1.txt index 69b3a68..48f99dd 100644 --- a/tmp/score/1.txt +++ b/tmp/score/1.txt @@ -1,10 +1,10 @@ -1:0.552734375 -2:0.0068359375 -3:0.0048828125 -4:0.775390625 -5:0.2373046875 -6:0.0546875 -7:0.0029296875 -8:0.0546875 -9:0.109375 -0:0.07421875 +1:0.4638671875 +2:0.0283203125 +3:0.1640625 +4:0.0302734375 +5:0.0439453125 +6:0.0166015625 +7:0.9033203125 +8:0.0166015625 +9:0.04296875 +0:0.0234375 diff --git a/tmp/score/1_0.png b/tmp/score/1_0.png index 33b55f9..b7b0188 100644 Binary files a/tmp/score/1_0.png and b/tmp/score/1_0.png differ diff --git a/tmp/score/1_1.png b/tmp/score/1_1.png index 0cca210..b7eb996 100644 Binary files a/tmp/score/1_1.png and b/tmp/score/1_1.png differ diff --git a/tmp/score/1_2.png b/tmp/score/1_2.png index 741f47c..eda761e 100644 Binary files a/tmp/score/1_2.png and b/tmp/score/1_2.png differ diff --git a/tmp/score/1_3.png b/tmp/score/1_3.png index 7be58ae..cde54b2 100644 Binary files a/tmp/score/1_3.png and b/tmp/score/1_3.png differ diff --git a/tmp/score/1_4.png b/tmp/score/1_4.png index ea2c76a..2fe2f90 100644 Binary files a/tmp/score/1_4.png and b/tmp/score/1_4.png differ diff --git a/tmp/score/1_5.png b/tmp/score/1_5.png index 9f08117..b22c9fa 100644 Binary files a/tmp/score/1_5.png and b/tmp/score/1_5.png differ diff --git a/tmp/score/1_6.png b/tmp/score/1_6.png index 3f8ec97..31f6b1f 100644 Binary files a/tmp/score/1_6.png and b/tmp/score/1_6.png differ diff --git a/tmp/score/1_7.png b/tmp/score/1_7.png index c3e4f78..1439d17 100644 Binary files a/tmp/score/1_7.png and b/tmp/score/1_7.png differ diff --git a/tmp/score/1_8.png b/tmp/score/1_8.png index 3f8ec97..4449ced 100644 Binary files a/tmp/score/1_8.png and b/tmp/score/1_8.png differ diff --git a/tmp/score/1_9.png b/tmp/score/1_9.png index 25b03fd..4c5009c 100644 Binary files a/tmp/score/1_9.png and b/tmp/score/1_9.png differ diff --git a/tmp/score/3.txt b/tmp/score/3.txt index 35b5c36..0a7dd68 100644 --- a/tmp/score/3.txt +++ b/tmp/score/3.txt @@ -1,10 +1,10 @@ -1:0.7451171875 -2:0.06640625 -3:0.8759765625 -4:0.033203125 -5:0.0771484375 -6:0.0546875 -7:0.009765625 -8:0.0478515625 -9:0.06640625 -0:0.068359375 +1:0.7802734375 +2:0.8837890625 +3:0.01171875 +4:0.037109375 +5:0.0146484375 +6:0.0908203125 +7:0.0078125 +8:0.0634765625 +9:0.029296875 +0:0.0908203125 diff --git a/tmp/score/3_0.png b/tmp/score/3_0.png index c36837d..d152e85 100644 Binary files a/tmp/score/3_0.png and b/tmp/score/3_0.png differ diff --git a/tmp/score/3_1.png b/tmp/score/3_1.png index 133851f..b08787d 100644 Binary files a/tmp/score/3_1.png and b/tmp/score/3_1.png differ diff --git a/tmp/score/3_2.png b/tmp/score/3_2.png index ea680cf..94a1cfd 100644 Binary files a/tmp/score/3_2.png and b/tmp/score/3_2.png differ diff --git a/tmp/score/3_3.png b/tmp/score/3_3.png index c294d16..060e415 100644 Binary files a/tmp/score/3_3.png and b/tmp/score/3_3.png differ diff --git a/tmp/score/3_4.png b/tmp/score/3_4.png index 3bf182e..c9b237c 100644 Binary files a/tmp/score/3_4.png and b/tmp/score/3_4.png differ diff --git a/tmp/score/3_5.png b/tmp/score/3_5.png index f72faf1..f6d69cc 100644 Binary files a/tmp/score/3_5.png and b/tmp/score/3_5.png differ diff --git a/tmp/score/3_6.png b/tmp/score/3_6.png index 0d8dd9e..d152e85 100644 Binary files a/tmp/score/3_6.png and b/tmp/score/3_6.png differ diff --git a/tmp/score/3_7.png b/tmp/score/3_7.png index 599e7c6..0b2ebeb 100644 Binary files a/tmp/score/3_7.png and b/tmp/score/3_7.png differ diff --git a/tmp/score/3_8.png b/tmp/score/3_8.png index 1e6425a..98130b7 100644 Binary files a/tmp/score/3_8.png and b/tmp/score/3_8.png differ diff --git a/tmp/score/3_9.png b/tmp/score/3_9.png index af99ad7..8914ba2 100644 Binary files a/tmp/score/3_9.png and b/tmp/score/3_9.png differ diff --git a/tmp/score/4.txt b/tmp/score/4.txt index d6e4203..1964424 100644 --- a/tmp/score/4.txt +++ b/tmp/score/4.txt @@ -1,10 +1,10 @@ -1:0.544921875 +1:0.7841796875 2:0.0078125 3:0.00390625 -4:0.7890625 -5:0.2373046875 -6:0.05859375 +4:0.044921875 +5:0.0185546875 +6:0.904296875 7:0.00390625 -8:0.05859375 -9:0.107421875 -0:0.078125 +8:0.7294921875 +9:0.037109375 +0:0.4052734375 diff --git a/tmp/score/4_0.png b/tmp/score/4_0.png index 31ffbe6..f0cec3f 100644 Binary files a/tmp/score/4_0.png and b/tmp/score/4_0.png differ diff --git a/tmp/score/4_1.png b/tmp/score/4_1.png index 153426d..a62f653 100644 Binary files a/tmp/score/4_1.png and b/tmp/score/4_1.png differ diff --git a/tmp/score/4_2.png b/tmp/score/4_2.png index 9cf41e3..f786a8a 100644 Binary files a/tmp/score/4_2.png and b/tmp/score/4_2.png differ diff --git a/tmp/score/4_3.png b/tmp/score/4_3.png index 5884ffe..9521046 100644 Binary files a/tmp/score/4_3.png and b/tmp/score/4_3.png differ diff --git a/tmp/score/4_4.png b/tmp/score/4_4.png index f9d7c51..b33fd5f 100644 Binary files a/tmp/score/4_4.png and b/tmp/score/4_4.png differ diff --git a/tmp/score/4_5.png b/tmp/score/4_5.png index db3e54b..b8cf622 100644 Binary files a/tmp/score/4_5.png and b/tmp/score/4_5.png differ diff --git a/tmp/score/4_6.png b/tmp/score/4_6.png index 33704bf..a59dc15 100644 Binary files a/tmp/score/4_6.png and b/tmp/score/4_6.png differ diff --git a/tmp/score/4_7.png b/tmp/score/4_7.png index 24c6d6c..11690d2 100644 Binary files a/tmp/score/4_7.png and b/tmp/score/4_7.png differ diff --git a/tmp/score/4_8.png b/tmp/score/4_8.png index 33704bf..4178bab 100644 Binary files a/tmp/score/4_8.png and b/tmp/score/4_8.png differ diff --git a/tmp/score/4_9.png b/tmp/score/4_9.png index a423788..bfa7406 100644 Binary files a/tmp/score/4_9.png and b/tmp/score/4_9.png differ diff --git a/tmp/score/img.png b/tmp/score/img.png index 837748f..b47d481 100644 Binary files a/tmp/score/img.png and b/tmp/score/img.png differ diff --git a/tmp/worst/0.txt b/tmp/worst/0.txt index 4833b28..54a143d 100644 --- a/tmp/worst/0.txt +++ b/tmp/worst/0.txt @@ -1,10 +1,10 @@ -1:0.75390625 -2:0.0078125 -3:0.00390625 -4:0.04296875 -5:0.0185546875 -6:0.2880859375 -7:0.00390625 -8:0.33984375 -9:0.0390625 -0:0.98828125 +1:0.751953125 +2:0.060546875 +3:0.96875 +4:0.03125 +5:0.0732421875 +6:0.048828125 +7:0.009765625 +8:0.04296875 +9:0.08203125 +0:0.064453125 diff --git a/tmp/worst/0_0.png b/tmp/worst/0_0.png index 830ccf4..a827446 100644 Binary files a/tmp/worst/0_0.png and b/tmp/worst/0_0.png differ diff --git a/tmp/worst/0_1.png b/tmp/worst/0_1.png index eddfcd7..a3fd095 100644 Binary files a/tmp/worst/0_1.png and b/tmp/worst/0_1.png differ diff --git a/tmp/worst/0_2.png b/tmp/worst/0_2.png index 9c66b33..76b017a 100644 Binary files a/tmp/worst/0_2.png and b/tmp/worst/0_2.png differ diff --git a/tmp/worst/0_3.png b/tmp/worst/0_3.png index 335efbc..26cbe76 100644 Binary files a/tmp/worst/0_3.png and b/tmp/worst/0_3.png differ diff --git a/tmp/worst/0_4.png b/tmp/worst/0_4.png index 309201c..7b89ef1 100644 Binary files a/tmp/worst/0_4.png and b/tmp/worst/0_4.png differ diff --git a/tmp/worst/0_5.png b/tmp/worst/0_5.png index d9e2df1..641bcd5 100644 Binary files a/tmp/worst/0_5.png and b/tmp/worst/0_5.png differ diff --git a/tmp/worst/0_6.png b/tmp/worst/0_6.png index 3c3b9c4..5e2c743 100644 Binary files a/tmp/worst/0_6.png and b/tmp/worst/0_6.png differ diff --git a/tmp/worst/0_7.png b/tmp/worst/0_7.png index 9789312..0b70b97 100644 Binary files a/tmp/worst/0_7.png and b/tmp/worst/0_7.png differ diff --git a/tmp/worst/0_8.png b/tmp/worst/0_8.png index bf10e92..978f398 100644 Binary files a/tmp/worst/0_8.png and b/tmp/worst/0_8.png differ diff --git a/tmp/worst/0_9.png b/tmp/worst/0_9.png index dce0eed..0861a93 100644 Binary files a/tmp/worst/0_9.png and b/tmp/worst/0_9.png differ diff --git a/tmp/worst/img.png b/tmp/worst/img.png index 90a6b62..8f1cec0 100644 Binary files a/tmp/worst/img.png and b/tmp/worst/img.png differ