Skip to content

Commit

Permalink
fix tests; tidy up old stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
svencc committed Sep 17, 2023
1 parent fbb010e commit c94b380
Show file tree
Hide file tree
Showing 84 changed files with 199 additions and 214 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import com.recom.service.dbcached.DBCachedService;
import com.recom.util.JSNumberUtil;
import jakarta.annotation.PostConstruct;
import lib.alphashape.AlphaShapeConcaveHull;
import lib.concavehull.ConcaveHull;
import lib.concavehull.Point;
import lib.clipboard.alphashape.AlphaShapeConcaveHull;
import lib.clipboard.concavehull.ConcaveHull;
import lib.clipboard.concavehull.Point;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib.alphashape;
package lib.clipboard.alphashape;

import lib.concavehull.Point;
import lib.clipboard.concavehull.Point;
import lombok.NonNull;
import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lib.alphashape;
package lib.clipboard.alphashape;

import java.util.ArrayList;
import java.util.List;
import lib.concavehull.Point;
import lib.clipboard.concavehull.Point;

public class QuickHull {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.concavehull;
package lib.clipboard.concavehull;

import lombok.NoArgsConstructor;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.concavehull;
package lib.clipboard.concavehull;

import lombok.Builder;
import lombok.Data;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.concavehull;
package lib.clipboard.concavehull;

import lombok.Builder;
import lombok.Data;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap;
package lib.clipboard.goap;

/**
* UnperformableActionException.java --- Exception raised when an Action could
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lib.goap.action;
package lib.clipboard.goap.action;

import lib.goap.state.GoapState;
import lib.goap.target.GoapTargetable;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.target.GoapTargetable;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib.goap.agent;
package lib.clipboard.goap.agent;

import lib.goap.action.GoapActionBase;
import lib.clipboard.goap.action.GoapActionBase;
import lombok.NonNull;

import java.util.Queue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lib.goap.agent;
package lib.clipboard.goap.agent;

import lib.goap.unit.IGoapUnit;
import lib.goap.planner.GoapPlanner;
import lib.goap.planner.GoapPlannerable;
import lib.clipboard.goap.planner.GoapPlanner;
import lib.clipboard.goap.unit.IGoapUnit;
import lib.clipboard.goap.planner.GoapPlannerable;
import lombok.NonNull;

public class GoapAgent extends GoapAgentBase {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package lib.goap.agent;
package lib.clipboard.goap.agent;

import lib.goap.action.GoapActionBase;
import lib.goap.state.GoapState;
import lib.goap.fsm.FSM;
import lib.goap.fsm.states.IdleState;
import lib.goap.fsm.states.PerformActionState;
import lib.goap.planner.GoapPlannerable;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.fsm.FSM;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.fsm.states.IdleState;
import lib.clipboard.goap.fsm.states.PerformActionState;
import lib.clipboard.goap.planner.GoapPlannerable;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.Getter;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib.goap.agent;
package lib.clipboard.goap.agent;

import lib.goap.state.GoapState;
import lib.clipboard.goap.state.GoapState;

public interface ImportantUnitChangeEventListenable {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib.goap.agent;
package lib.clipboard.goap.agent;

import lib.goap.action.GoapActionBase;
import lib.clipboard.goap.action.GoapActionBase;

import java.util.Queue;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package lib.goap.fsm;
package lib.clipboard.goap.fsm;

import lib.goap.action.GoapActionBase;
import lib.goap.agent.FSMPlanEventListenable;
import lib.goap.fsm.states.FSMStateful;
import lib.goap.fsm.states.PerformActionState;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.agent.FSMPlanEventListenable;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.fsm.states.FSMStateful;
import lib.clipboard.goap.fsm.states.PerformActionState;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.NoArgsConstructor;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib.goap.fsm.states;
package lib.clipboard.goap.fsm.states;

import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.NonNull;

public interface FSMStateful {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package lib.goap.fsm.states;
package lib.clipboard.goap.fsm.states;

import lib.goap.action.GoapActionBase;
import lib.goap.agent.PlanCreatedEventListenable;
import lib.goap.planner.GoapPlannerable;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.agent.PlanCreatedEventListenable;
import lib.clipboard.goap.planner.GoapPlannerable;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.NonNull;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package lib.goap.fsm.states;
package lib.clipboard.goap.fsm.states;

import lib.goap.action.GoapActionBase;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package lib.goap.fsm.states;
package lib.clipboard.goap.fsm.states;

import lib.goap.action.GoapActionBase;
import lib.goap.UnperformableActionException;
import lib.goap.fsm.FSM;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.fsm.FSM;
import lib.clipboard.goap.unit.IGoapUnit;
import lib.clipboard.goap.UnperformableActionException;
import lombok.Getter;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.NoArgsConstructor;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.NonNull;

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/lib/clipboard/goap/graph/Edge.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package lib.clipboard.goap.graph;

public class Edge {

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.NonNull;
import org.springframework.lang.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lib.goap.action.GoapActionBase;
import lib.goap.state.GoapState;
import lib.goap.state.WorldAspect;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.state.WorldAspect;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.lang.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.NonNull;
import org.springframework.lang.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.graph;
package lib.clipboard.goap.graph;

import lombok.Getter;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package lib.goap.planner;
package lib.clipboard.goap.planner;


import lib.goap.graph.DirectedWeightedGraph;
import lib.goap.graph.IWeightedGraph;
import lib.goap.graph.WeightedEdge;
import lib.goap.graph.Node;
import lib.clipboard.goap.graph.DirectedWeightedGraph;
import lib.clipboard.goap.graph.IWeightedGraph;
import lib.clipboard.goap.graph.WeightedEdge;
import lib.clipboard.goap.graph.Node;

public class GoapPlanner extends GoapPlannerBase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package lib.goap.planner;
package lib.clipboard.goap.planner;

import lib.goap.action.GoapActionBase;
import lib.goap.graph.*;
import lib.goap.state.GoapState;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.graph.*;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.Getter;
import lombok.NonNull;
import org.hibernate.mapping.Array;
import org.springframework.lang.Nullable;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package lib.goap.planner;
package lib.clipboard.goap.planner;

import lib.goap.action.GoapActionBase;
import lib.goap.unit.IGoapUnit;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.unit.IGoapUnit;
import lombok.NonNull;

import java.util.Queue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.state;
package lib.clipboard.goap.state;

import lombok.Data;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.state;
package lib.clipboard.goap.state;

public interface Important {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.state;
package lib.clipboard.goap.state;

public interface Stateful {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.state;
package lib.clipboard.goap.state;

public interface WorldAspect extends Stateful {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.target;
package lib.clipboard.goap.target;

public interface GoapTargetable {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.goap.target;
package lib.clipboard.goap.target;

public class NullTarget implements GoapTargetable {
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package lib.goap.unit;
package lib.clipboard.goap.unit;

import lib.goap.action.GoapActionBase;
import lib.goap.agent.ImportantUnitChangeEventListenable;
import lib.goap.state.GoapState;
import lib.goap.state.WorldAspect;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.agent.ImportantUnitChangeEventListenable;
import lib.clipboard.goap.state.WorldAspect;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package lib.goap.unit;
package lib.clipboard.goap.unit;

import lib.goap.action.GoapActionBase;
import lib.goap.agent.ImportantUnitChangeEventListenable;
import lib.goap.state.GoapState;
import lib.goap.state.WorldAspect;
import lib.clipboard.goap.action.GoapActionBase;
import lib.clipboard.goap.state.GoapState;
import lib.clipboard.goap.agent.ImportantUnitChangeEventListenable;
import lib.clipboard.goap.state.WorldAspect;
import lombok.NonNull;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.graph;
package lib.clipboard.graph;

import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.graph;
package lib.clipboard.graph;

import lombok.Getter;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.graph;
package lib.clipboard.graph;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lib.graph;
package lib.clipboard.graph;


import lombok.NonNull;
Expand Down
Loading

0 comments on commit c94b380

Please sign in to comment.