From 64c86b727d4e8a90575cda8a7bc9bf1dd6ec75e4 Mon Sep 17 00:00:00 2001 From: Nakamura Tsukasa Date: Mon, 24 Aug 2020 17:02:55 +0900 Subject: [PATCH 1/5] succeed --- .../com/example/demo/DemoApplication.java | 8 ++++---- .../com/example/demo/DemoApplication.class | Bin 1392 -> 1060 bytes .../example/demo/DemoApplicationTests.class | Bin 531 -> 531 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index 452d348..ee8a51e 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -18,10 +18,10 @@ public static void main(String[] args) { @Override // アプリ起動時に実行される。 public void run(String... strings) throws Exception { - jdbcTemplate.execute("CREATE TABLE customers(" + - "id SERIAL, first_name VARCHAR(255), last_name VARCHAR(255))"); - - jdbcTemplate.update("INSERT INTO customers(first_name, last_name) VALUES ('John','Woo')"); +// jdbcTemplate.execute("CREATE TABLE customers(" + +// "id SERIAL, first_name VARCHAR(255), last_name VARCHAR(255))"); +// +// jdbcTemplate.update("INSERT INTO customers(first_name, last_name) VALUES ('John','Woo')"); } diff --git a/target/classes/com/example/demo/DemoApplication.class b/target/classes/com/example/demo/DemoApplication.class index 0fcc45f1dbfd89361a690a43f0b378670d0538b3..0bd659e109b46cb1b169830cc0ab22a714835203 100644 GIT binary patch delta 437 zcmZWlJ5Iwu6r7FiY+`K42NJ?3d;$o9L?k4jiI7l4k%|HdY7?U1ByuclAv(?w`3hWs z3PeFgg(xXF1}8wwIw%wro_V`7@6B6(nfIys+xPPefCFrpNI;X&Ef`1&WV+6cQ|mik zr*?ADZMQ;!WZm`L@K8Y8+&Ys;4eg3;!o-AxWx>Yeu(^;u^{-v8bL9Jdx8;QHz>7Xb zk8?A_=BuGM2AAzKBGDQdFpCmTY0P1sF4epr2LY*^tUe)q zKI+e^0qRGA&y|=&F?!d_J)3P>+_pzWssHjyab960{^rq!B`gw`*`kwIP-bPQYc;15 K%b3lGdo29 delta 721 zcmZ`$%Wl(95Ir|9JH`!7`k*ZkOhbunQUZaL1r<^nStTfHk&~uNWD?W5q;?fMsJnba zC?<&oVD1f<6OYhi(X%%?UT*9o35#8s`skf?h-TS6R{Wn6+B{$#!= z;R;A-Y205=%2>hG@!Qv7Jysb>#%b3+2^`P$1>9tqo6h;$NrRyvLx3n^jlry&My+iq z?b=q;P`X1u@Q&?)uR1-YWtfdxv!uLo27d6uwT^A2Q#0#NYo=PMR<)ASxBk7)O&Xen zA~XRigC1@(eI!H29R|TZwY$T>W>`?0Q)jJU;J62mwT_5&hONd9&21}R*ugL`4j<6ge0K&r;-20w9Mu%4y7Ffl!>hL7Df& z9MivIaeu@nN*Sz*njQe*juUg5UrE diff --git a/target/test-classes/com/example/demo/DemoApplicationTests.class b/target/test-classes/com/example/demo/DemoApplicationTests.class index 5756833c4780677c856318903efb4797406ce354..94f704627e74ef853c9b9f08f8235b9ad1227148 100644 GIT binary patch delta 130 zcmbQtGMPpE)W2Q(7#JAL8AP}km>8JZ8CZB2SQ*$RS||b8920pp*clmEobyvsH)gXl zDzgLCfB=XDs$yVd-~_VtfixpXL~A<(ph I3NtVO0LU2*Qvd(} delta 130 zcmbQtGMR<<)W2Q(7#JAL8AR9_m?qk2FtanTOcYlVWMp7*&QD3@Vqj+A+7#Y}sEPWu&2ollS&cHEwDx(fBKadBK6#&xglMgW(h%zw<0@+Lq LLJTlDVFm^O)(s9+ From 7066f5da232a5f54397535dae99c1740bca65972 Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Tue, 25 Aug 2020 11:40:05 +0900 Subject: [PATCH 2/5] classify monozu --- demo.iml | 33 ++++++++++++++++- pom.xml | 5 +++ .../demo/controller/ImageController.java | 37 +++++++++++-------- 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/demo.iml b/demo.iml index 91829d4..1e3d467 100644 --- a/demo.iml +++ b/demo.iml @@ -39,7 +39,6 @@ - @@ -134,5 +133,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 85c77e8..67c07dd 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,11 @@ ibm-watson 8.5.0 + + com.ibm.watson + visual-recognition + 8.5.0 + diff --git a/src/main/java/com/example/demo/controller/ImageController.java b/src/main/java/com/example/demo/controller/ImageController.java index 704bfc6..e9d033e 100644 --- a/src/main/java/com/example/demo/controller/ImageController.java +++ b/src/main/java/com/example/demo/controller/ImageController.java @@ -1,33 +1,40 @@ package com.example.demo.controller; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.ibm.cloud.sdk.core.security.IamAuthenticator; +import com.ibm.watson.visual_recognition.v3.VisualRecognition; +import com.ibm.watson.visual_recognition.v3.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.*; -import twitter4j.*; - -import java.awt.*; -import java.util.List; -import java.util.Map; - -import java.applet.Applet; -import java.net.URL; +import org.springframework.web.bind.annotation.RequestMethod; @RestController -@RequestMapping(path = "/") -public class ImageController extends Applet{ +@RequestMapping(path = "/Image") +public class ImageController { private static final Logger LOG = LoggerFactory.getLogger(ImageController.class); @Autowired JdbcTemplate jdbcTemplate; - @RequestMapping(path = "/image", method = RequestMethod.GET) + @RequestMapping(path = "/test", method = RequestMethod.GET) public String test() { - IamAuthenticator authenticator = new IamAuthenticator("{apikey}"); - VisualRecognition visualRecognition = new VisualRecognition("{version}", authenticator); - visualRecognition.setServiceUrl("{url}"); + IamAuthenticator authenticator = new IamAuthenticator("8nwN0eKp7eZ73So4DLdPndp_yv-vtlI27pN1wK2TjVg1"); + VisualRecognition visualRecognition = new VisualRecognition("2019-07-12", authenticator); +// visualRecognition.setServiceUrl("https://zukan.pokemon.co.jp/zukan-api/up/images/index/"); + + System.out.println("Classify an image"); + ClassifyOptions options = new ClassifyOptions.Builder() + .url("https://zukan.pokemon.co.jp/zukan-api/up/images/index/94b9fb82b38847b83a8041e9a78989ce.png") + .build(); + ClassifiedImages result = visualRecognition.classify(options).execute().getResult(); + System.out.println(result); + return "asdfg"; } } \ No newline at end of file From 7edbd048fd923613f81fcf284e205e7d1993595a Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Tue, 25 Aug 2020 14:08:36 +0900 Subject: [PATCH 3/5] classify local image --- .../demo/controller/ImageController.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ImageController.java b/src/main/java/com/example/demo/controller/ImageController.java index e9d033e..8399f43 100644 --- a/src/main/java/com/example/demo/controller/ImageController.java +++ b/src/main/java/com/example/demo/controller/ImageController.java @@ -1,10 +1,15 @@ package com.example.demo.controller; +import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; import java.util.Map; import com.ibm.cloud.sdk.core.security.IamAuthenticator; +import com.ibm.watson.natural_language_understanding.v1.model.AnalysisResults; +import com.ibm.watson.natural_language_understanding.v1.model.AnalyzeOptions; +import com.ibm.watson.natural_language_understanding.v1.model.CategoriesResult; +import com.ibm.watson.natural_language_understanding.v1.model.Features; import com.ibm.watson.visual_recognition.v3.VisualRecognition; import com.ibm.watson.visual_recognition.v3.model.*; import org.slf4j.Logger; @@ -13,6 +18,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestMethod; +import java.io.File; @RestController @RequestMapping(path = "/Image") @@ -23,18 +29,21 @@ public class ImageController { JdbcTemplate jdbcTemplate; @RequestMapping(path = "/test", method = RequestMethod.GET) - public String test() { + public String test( + @RequestParam(name = "img_path", defaultValue = "/Users/NakamuraTsukasa/Desktop/633.png") String img_path + ) throws FileNotFoundException { +// String url = "https://zukan.pokemon.co.jp/zukan-api/up/images/index/94b9fb82b38847b83a8041e9a78989ce.png"; +// String img_path = "/Users/NakamuraTsukasa/Desktop/634.png"; + IamAuthenticator authenticator = new IamAuthenticator("8nwN0eKp7eZ73So4DLdPndp_yv-vtlI27pN1wK2TjVg1"); VisualRecognition visualRecognition = new VisualRecognition("2019-07-12", authenticator); -// visualRecognition.setServiceUrl("https://zukan.pokemon.co.jp/zukan-api/up/images/index/"); - System.out.println("Classify an image"); ClassifyOptions options = new ClassifyOptions.Builder() - .url("https://zukan.pokemon.co.jp/zukan-api/up/images/index/94b9fb82b38847b83a8041e9a78989ce.png") + //.url(url) + .imagesFile(new File(img_path)) .build(); ClassifiedImages result = visualRecognition.classify(options).execute().getResult(); System.out.println(result); - return "asdfg"; + return result.toString(); } - } \ No newline at end of file From 181748ecc9132a4a2022c77df3fa71488dfedfae Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Tue, 25 Aug 2020 14:47:50 +0900 Subject: [PATCH 4/5] select a class --- .../demo/controller/ImageController.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/controller/ImageController.java b/src/main/java/com/example/demo/controller/ImageController.java index 8399f43..cc16530 100644 --- a/src/main/java/com/example/demo/controller/ImageController.java +++ b/src/main/java/com/example/demo/controller/ImageController.java @@ -44,6 +44,31 @@ public String test( .build(); ClassifiedImages result = visualRecognition.classify(options).execute().getResult(); System.out.println(result); - return result.toString(); + + List images = result.getImages(); + + ClassifiedImage image = images.get(0); + ClassifierResult r = image.getClassifiers().get(0); + ClassResult c = r.getClasses().get(0); + + return c.getXClass(); + +// for (ClassifiedImage image : images) { +// +// List cr = image.getClassifiers(); +// for (ClassifierResult r : cr) { +// // System.err.println(r.getName()); +// List cc = r.getClasses(); +// for (ClassResult c : cc) { +// // System.err.println("ClassResult : " + c); +// System.err.println("ClassName : " + c.getXClass()); +// System.err.println("Score : " + c.getScore()); +// System.err.println("TypeHierarchy : " + c.getTypeHierarchy()); +// System.err.println("---"); +// } +// } +// } +// +// return result.toString(); } } \ No newline at end of file From 2c60fed89af830df69c0f169945f1a88e22402a0 Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Tue, 25 Aug 2020 15:03:43 +0900 Subject: [PATCH 5/5] delete unnecessary code --- .../demo/controller/ImageController.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ImageController.java b/src/main/java/com/example/demo/controller/ImageController.java index cc16530..2b83bfe 100644 --- a/src/main/java/com/example/demo/controller/ImageController.java +++ b/src/main/java/com/example/demo/controller/ImageController.java @@ -33,7 +33,6 @@ public String test( @RequestParam(name = "img_path", defaultValue = "/Users/NakamuraTsukasa/Desktop/633.png") String img_path ) throws FileNotFoundException { // String url = "https://zukan.pokemon.co.jp/zukan-api/up/images/index/94b9fb82b38847b83a8041e9a78989ce.png"; -// String img_path = "/Users/NakamuraTsukasa/Desktop/634.png"; IamAuthenticator authenticator = new IamAuthenticator("8nwN0eKp7eZ73So4DLdPndp_yv-vtlI27pN1wK2TjVg1"); VisualRecognition visualRecognition = new VisualRecognition("2019-07-12", authenticator); @@ -53,22 +52,5 @@ public String test( return c.getXClass(); -// for (ClassifiedImage image : images) { -// -// List cr = image.getClassifiers(); -// for (ClassifierResult r : cr) { -// // System.err.println(r.getName()); -// List cc = r.getClasses(); -// for (ClassResult c : cc) { -// // System.err.println("ClassResult : " + c); -// System.err.println("ClassName : " + c.getXClass()); -// System.err.println("Score : " + c.getScore()); -// System.err.println("TypeHierarchy : " + c.getTypeHierarchy()); -// System.err.println("---"); -// } -// } -// } -// -// return result.toString(); } } \ No newline at end of file