Skip to content

fixed incorrect checking string equality #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2017
Merged

fixed incorrect checking string equality #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions aima-core/src/main/java/aima/core/environment/connectfour/ConnectFourGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import aima.core.search.adversarial.Game;

Expand Down Expand Up @@ -54,7 +55,7 @@ public String getPlayer(int playerNum) {
*/
public int getPlayerNum(String player) {
for (int i = 0; i < players.length; i++)
if (players[i] == player)
if (Objects.equals(players[i], player))
return i+1;
throw new IllegalArgumentException("Wrong player number.");
}
Expand Down Expand Up @@ -84,7 +85,7 @@ public boolean isTerminal(ConnectFourState state) {
public double getUtility(ConnectFourState state, String player) {
double result = state.getUtility();
if (result != -1) {
if (player == players[1])
if (Objects.equals(player, players[1]))
result = 1 - result;
} else {
throw new IllegalArgumentException("State is not terminal.");
Expand Down
3 changes: 2 additions & 1 deletion aima-core/src/main/java/aima/core/environment/tictactoe/TicTacToeGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package aima.core.environment.tictactoe;

import java.util.List;
import java.util.Objects;

import aima.core.search.adversarial.Game;
import aima.core.util.datastructure.XYLocation;
Expand Down Expand Up @@ -52,7 +53,7 @@ public boolean isTerminal(TicTacToeState state) {
public double getUtility(TicTacToeState state, String player) {
double result = state.getUtility();
if (result != -1) {
if (player == TicTacToeState.O)
if (Objects.equals(player, TicTacToeState.O))
result = 1 - result;
} else {
throw new IllegalArgumentException("State is not terminal.");
Expand Down
3 changes: 2 additions & 1 deletion aima-gui/src/main/java/aima/gui/fx/views/MapEnvironmentViewCtrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import aima.core.agent.Agent;
import aima.core.agent.Environment;
Expand Down Expand Up @@ -78,7 +79,7 @@ protected void update() {
// print track of first agent
if (!env.getAgents().isEmpty()) {
String aLoc = env.getAgentLocation(env.getAgents().get(0));
if (track.isEmpty() || track.get(track.size() - 1) != aLoc)
if (track.isEmpty() || !Objects.equals(track.get(track.size() - 1), aLoc))
track.add(aLoc);
for (int i = 1; i < track.size(); i++) {
Point2D pt1 = map.getPosition(track.get(i - 1));
Expand Down