Skip to content

Commit

Permalink
Move com.fluxchess to com.fluxchess.flux
Browse files Browse the repository at this point in the history
  • Loading branch information
fluxroot committed Feb 14, 2014
1 parent ff51259 commit fafef9c
Show file tree
Hide file tree
Showing 63 changed files with 191 additions and 191 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.jcpi.commands.IProtocol;
import com.fluxchess.jcpi.commands.ProtocolInformationCommand;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.jcpi.options.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.board.Hex88Board;
import com.fluxchess.board.IntColor;
import com.fluxchess.evaluation.Evaluation;
import com.fluxchess.flux.board.Hex88Board;
import com.fluxchess.flux.board.IntColor;
import com.fluxchess.flux.evaluation.Evaluation;
import com.fluxchess.jcpi.AbstractEngine;
import com.fluxchess.jcpi.commands.*;
import com.fluxchess.jcpi.models.GenericBoard;
import com.fluxchess.jcpi.models.GenericColor;
import com.fluxchess.jcpi.models.GenericMove;
import com.fluxchess.jcpi.options.AbstractOption;
import com.fluxchess.jcpi.protocols.IProtocolHandler;
import com.fluxchess.move.IntMove;
import com.fluxchess.table.EvaluationTable;
import com.fluxchess.table.PawnTable;
import com.fluxchess.table.TranspositionTable;
import com.fluxchess.flux.move.IntMove;
import com.fluxchess.flux.table.EvaluationTable;
import com.fluxchess.flux.table.PawnTable;
import com.fluxchess.flux.table.TranspositionTable;

import java.util.Arrays;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.jcpi.models.GenericMove;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.jcpi.commands.IProtocol;
import com.fluxchess.jcpi.commands.ProtocolBestMoveCommand;
import com.fluxchess.jcpi.commands.ProtocolInformationCommand;
import com.fluxchess.jcpi.models.GenericMove;
import com.fluxchess.move.IntValue;
import com.fluxchess.move.PrincipalVariation;
import com.fluxchess.table.TranspositionTable;
import com.fluxchess.flux.move.IntValue;
import com.fluxchess.flux.move.PrincipalVariation;
import com.fluxchess.flux.table.TranspositionTable;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.move.IntMove;
import com.fluxchess.move.IntValue;
import com.fluxchess.flux.move.IntMove;
import com.fluxchess.flux.move.IntValue;

public final class Result {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

import com.fluxchess.board.*;
import com.fluxchess.evaluation.IEvaluation;
import com.fluxchess.flux.board.*;
import com.fluxchess.flux.evaluation.IEvaluation;
import com.fluxchess.jcpi.models.GenericMove;
import com.fluxchess.move.*;
import com.fluxchess.table.HistoryTable;
import com.fluxchess.table.KillerTable;
import com.fluxchess.table.TranspositionTable;
import com.fluxchess.table.TranspositionTableEntry;
import com.fluxchess.flux.move.*;
import com.fluxchess.flux.table.HistoryTable;
import com.fluxchess.flux.table.KillerTable;
import com.fluxchess.flux.table.TranspositionTable;
import com.fluxchess.flux.table.TranspositionTableEntry;

import java.util.*;
import java.util.concurrent.Semaphore;
Expand Down Expand Up @@ -95,9 +95,9 @@ public final class Search implements ISearch, Runnable {
private static HistoryTable historyTable;

// Search information
private static final MoveList[] pvList = new MoveList[ISearch.MAX_HEIGHT + 1];
private static final HashMap<Integer, PrincipalVariation> multiPvMap = new HashMap<Integer, PrincipalVariation>(ISearch.MAX_MOVES);
private static final SearchStackEntry[] searchStack = new SearchStackEntry[ISearch.MAX_HEIGHT + 1];
private static final MoveList[] pvList = new MoveList[MAX_HEIGHT + 1];
private static final HashMap<Integer, PrincipalVariation> multiPvMap = new HashMap<Integer, PrincipalVariation>(MAX_MOVES);
private static final SearchStackEntry[] searchStack = new SearchStackEntry[MAX_HEIGHT + 1];
private Result bestResult = null;
private final int[] timeTable;

Expand Down Expand Up @@ -251,8 +251,8 @@ public void setSearchDepth(int searchDepth) {
assert searchDepth > 0;

this.searchDepth = searchDepth;
if (this.searchDepth > ISearch.MAX_DEPTH) {
this.searchDepth = ISearch.MAX_DEPTH;
if (this.searchDepth > MAX_DEPTH) {
this.searchDepth = MAX_DEPTH;
}
this.doTimeManagement = false;
}
Expand All @@ -261,7 +261,7 @@ public void setSearchNodes(long searchNodes) {
assert searchNodes > 0;

this.searchNodes = searchNodes;
this.searchDepth = ISearch.MAX_DEPTH;
this.searchDepth = MAX_DEPTH;
this.doTimeManagement = false;
}

Expand All @@ -270,7 +270,7 @@ public void setSearchTime(long searchTime) {

this.searchTime = searchTime;
this.searchTimeHard = this.searchTime;
this.searchDepth = ISearch.MAX_DEPTH;
this.searchDepth = MAX_DEPTH;
this.doTimeManagement = false;
}

Expand All @@ -293,13 +293,13 @@ public void setSearchMovesToGo(int searchMovesToGo) {
}

public void setSearchInfinite() {
this.searchDepth = ISearch.MAX_DEPTH;
this.searchDepth = MAX_DEPTH;
this.doTimeManagement = false;
this.analyzeMode = true;
}

public void setSearchPonder() {
this.searchDepth = ISearch.MAX_DEPTH;
this.searchDepth = MAX_DEPTH;
this.doTimeManagement = false;
}

Expand All @@ -323,7 +323,7 @@ public void run() {

private void setTimeManagement() {
// Dynamic time allocation
this.searchDepth = ISearch.MAX_DEPTH;
this.searchDepth = MAX_DEPTH;

if (this.searchClock[this.myColor] > 0) {
// We received a time control.
Expand Down Expand Up @@ -690,7 +690,7 @@ private int alphaBetaRoot(int depth, int alpha, int beta, int height, MoveList r
updateSearch(height);

// Abort conditions
if ((this.stopped && this.canStop) || height == ISearch.MAX_HEIGHT) {
if ((this.stopped && this.canStop) || height == MAX_HEIGHT) {
return this.evaluation.evaluate(board);
}

Expand Down Expand Up @@ -907,7 +907,7 @@ private int alphaBeta(int depth, int alpha, int beta, int height, boolean pvNode
updateSearch(height);

// Abort conditions
if ((this.stopped && this.canStop) || height == ISearch.MAX_HEIGHT) {
if ((this.stopped && this.canStop) || height == MAX_HEIGHT) {
return this.evaluation.evaluate(board);
}

Expand Down Expand Up @@ -1324,7 +1324,7 @@ private int quiescent(int checkingDepth, int alpha, int beta, int height, boolea
updateSearch(height);

// Abort conditions
if ((this.stopped && this.canStop) || height == ISearch.MAX_HEIGHT) {
if ((this.stopped && this.canStop) || height == MAX_HEIGHT) {
return this.evaluation.evaluate(board);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess;
package com.fluxchess.flux;

public final class SearchStackEntry {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

/**
* Notes: Ideas from Fruit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

/**
* Notes: Ideas from Mediocre Chess and Bruce Moreland
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

public final class ChessmanList {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

import com.fluxchess.ISearch;
import com.fluxchess.evaluation.PositionValues;
import com.fluxchess.flux.ISearch;
import com.fluxchess.flux.evaluation.PositionValues;
import com.fluxchess.jcpi.models.*;
import com.fluxchess.move.IntCastling;
import com.fluxchess.move.IntMove;
import com.fluxchess.table.RepetitionTable;
import com.fluxchess.flux.move.IntCastling;
import com.fluxchess.flux.move.IntMove;
import com.fluxchess.flux.table.RepetitionTable;

import java.util.Random;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

public final class Hex88BoardStackEntry {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

import com.fluxchess.jcpi.models.GenericChessman;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

import com.fluxchess.jcpi.models.GenericColor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

public class IntGamePhase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

import com.fluxchess.jcpi.models.GenericFile;
import com.fluxchess.jcpi.models.GenericPosition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.board;
package com.fluxchess.flux.board;

public final class PositionList {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.evaluation;

import com.fluxchess.Configuration;
import com.fluxchess.Search;
import com.fluxchess.board.*;
import com.fluxchess.move.IntCastling;
import com.fluxchess.move.IntMove;
import com.fluxchess.move.MoveGenerator;
import com.fluxchess.move.MoveSee;
import com.fluxchess.table.EvaluationTable;
import com.fluxchess.table.EvaluationTableEntry;
import com.fluxchess.table.PawnTable;
package com.fluxchess.flux.evaluation;

import com.fluxchess.flux.Configuration;
import com.fluxchess.flux.Search;
import com.fluxchess.flux.board.*;
import com.fluxchess.flux.move.IntCastling;
import com.fluxchess.flux.move.IntMove;
import com.fluxchess.flux.move.MoveGenerator;
import com.fluxchess.flux.move.MoveSee;
import com.fluxchess.flux.table.EvaluationTable;
import com.fluxchess.flux.table.EvaluationTableEntry;
import com.fluxchess.flux.table.PawnTable;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.evaluation;
package com.fluxchess.flux.evaluation;

import com.fluxchess.board.Hex88Board;
import com.fluxchess.flux.board.Hex88Board;

public interface IEvaluation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.evaluation;
package com.fluxchess.flux.evaluation;

import com.fluxchess.board.IntColor;
import com.fluxchess.board.IntGamePhase;
import com.fluxchess.flux.board.IntColor;
import com.fluxchess.flux.board.IntGamePhase;

public final class PositionValues {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Flux Chess. If not, see <http://www.gnu.org/licenses/>.
*/
package com.fluxchess.move;
package com.fluxchess.flux.move;

public final class IntCastling {

Expand Down
Loading

0 comments on commit fafef9c

Please sign in to comment.