-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
15 changed files
with
393 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...ibrary-database/src/main/java/com/playshogi/library/database/search/KifuSearchFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.playshogi.library.database.search; | ||
|
|
||
| import com.playshogi.library.shogi.models.position.ReadOnlyShogiPosition; | ||
|
|
||
| public class KifuSearchFilter { | ||
|
|
||
| private final ReadOnlyShogiPosition partialPositionSearch; | ||
|
|
||
| public KifuSearchFilter(final ReadOnlyShogiPosition partialPositionSearch) { | ||
| this.partialPositionSearch = partialPositionSearch; | ||
| } | ||
|
|
||
| public ReadOnlyShogiPosition getPartialPositionSearch() { | ||
| return partialPositionSearch; | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
...brary-database/src/main/java/com/playshogi/library/database/search/KifuSearchManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package com.playshogi.library.database.search; | ||
|
|
||
| import com.playshogi.library.database.DbConnection; | ||
| import com.playshogi.library.database.GameRepository; | ||
| import com.playshogi.library.database.KifuRepository; | ||
| import com.playshogi.library.database.models.PersistentGame; | ||
| import com.playshogi.library.database.models.PersistentKifu; | ||
| import com.playshogi.library.shogi.models.formats.sfen.SfenConverter; | ||
| import com.playshogi.library.shogi.models.position.ReadOnlyShogiPosition; | ||
| import com.playshogi.library.shogi.models.position.Square; | ||
| import com.playshogi.library.shogi.models.record.GameNavigation; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| public class KifuSearchManager { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(KifuSearchManager.class.getName()); | ||
|
|
||
|
|
||
| private final GameRepository gameRepository = new GameRepository(new DbConnection()); | ||
| private final KifuRepository kifuRepository = new KifuRepository(new DbConnection()); | ||
|
|
||
| private final List<PersistentKifu> kifus = new ArrayList<>(); | ||
|
|
||
| public KifuSearchManager() { | ||
| System.out.println("Loading games from db..."); | ||
| List<PersistentGame> games = gameRepository.getGamesFromGameSet(1, true); | ||
| for (PersistentGame game : games) { | ||
| if (game.getKifuId() % 1000 == 0) System.out.println("Loading #" + game.getKifuId()); | ||
| try { | ||
| kifus.add(kifuRepository.getKifuById(game.getKifuId(), true)); | ||
| } catch (Exception ex) { | ||
| LOGGER.log(Level.SEVERE, "Error loading the kifu " + game.getKifuId(), ex); | ||
| } | ||
| } | ||
| System.out.println("Loaded games from db!"); | ||
| } | ||
|
|
||
| public List<KifuSearchResult> searchGames(final KifuSearchFilter filter) { | ||
| List<KifuSearchResult> result = new ArrayList<>(); | ||
| for (PersistentKifu persistentKifu : kifus) { | ||
| GameNavigation navigation = new GameNavigation(persistentKifu.getKifu().getGameTree()); | ||
| int movec = 0; | ||
| while (navigation.canMoveForward() && movec++ < 40) { | ||
| navigation.moveForward(); | ||
| if (positionContains(navigation.getPosition(), filter.getPartialPositionSearch())) { | ||
| System.out.println(persistentKifu.getKifu().getGameInformation() + " - In kifu #" + persistentKifu.getId() + ":"); | ||
| System.out.println(navigation.getPosition()); | ||
|
|
||
| result.add(new KifuSearchResult(persistentKifu, navigation.getPosition())); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| private boolean positionContains(final ReadOnlyShogiPosition fullPosition, | ||
| final ReadOnlyShogiPosition partialPosition) { | ||
| for (Square square : partialPosition.getAllSquares()) { | ||
| if (partialPosition.isEmptySquare(square)) continue; | ||
| if (fullPosition.isEmptySquare(square)) return false; | ||
| if (partialPosition.getPieceAt(square).get() != fullPosition.getPieceAt(square).get()) return false; | ||
| } | ||
|
|
||
| //TODO komadai? | ||
| return true; | ||
| } | ||
|
|
||
| public static void main(String[] args) { | ||
| KifuSearchManager manager = new KifuSearchManager(); | ||
| manager.searchGames(new KifuSearchFilter(SfenConverter.fromSFEN("9/9/9/9/9/9/9/6R2/9 b kr2b4g4s4n4l18p"))); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...ibrary-database/src/main/java/com/playshogi/library/database/search/KifuSearchResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.playshogi.library.database.search; | ||
|
|
||
| import com.playshogi.library.database.models.PersistentKifu; | ||
| import com.playshogi.library.shogi.models.position.ReadOnlyShogiPosition; | ||
|
|
||
| public class KifuSearchResult { | ||
| private final PersistentKifu kifu; | ||
| private final ReadOnlyShogiPosition position; | ||
|
|
||
| public KifuSearchResult(final PersistentKifu kifu, final ReadOnlyShogiPosition position) { | ||
| this.kifu = kifu; | ||
| this.position = position; | ||
| } | ||
|
|
||
| public PersistentKifu getKifu() { | ||
| return kifu; | ||
| } | ||
|
|
||
| public ReadOnlyShogiPosition getPosition() { | ||
| return position; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...t/src/main/java/com/playshogi/website/gwt/client/events/collections/SearchKifusEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.playshogi.website.gwt.client.events.collections; | ||
|
|
||
| import com.google.web.bindery.event.shared.binder.GenericEvent; | ||
| import com.playshogi.library.shogi.models.record.GameResult; | ||
|
|
||
| public class SearchKifusEvent extends GenericEvent { | ||
| private final GameResult result; | ||
| private final String player; | ||
| private final String partialPositionSfen; | ||
|
|
||
| public SearchKifusEvent(final GameResult result, String player, String partialPositionSfen) { | ||
| this.result = result; | ||
| this.player = player; | ||
| this.partialPositionSfen = partialPositionSfen; | ||
| } | ||
|
|
||
| public GameResult getResult() { | ||
| return result; | ||
| } | ||
|
|
||
| public String getPlayer() { | ||
| return player; | ||
| } | ||
|
|
||
| public String getPartialPositionSfen() { | ||
| return partialPositionSfen; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.