Voomra/trader
Archived
0
Fork 0
Code Activity

- update paths layout

Browse Source 
- add top routers
- add orders button
This commit is contained in:
iMoHax
2014-08-19 17:20:30 +04:00
parent 2604939f96
commit 14c2021e0c
16 changed files with 419 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/main/java/ru/trader/controllers/PathsController.java
View File

@@ -4,16 +4,11 @@ import javafx.collections.FXCollections;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Parent;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.util.converter.LongStringConverter;
import org.controlsfx.control.ButtonBar;
import org.controlsfx.control.action.AbstractAction;
import org.controlsfx.control.action.Action;
import org.controlsfx.dialog.Dialog;
import ru.trader.graph.PathRoute;
import ru.trader.model.OrderModel;
import ru.trader.model.PathRouteModel;
import java.util.Collection;
@@ -42,7 +37,7 @@ public class PathsController {
}
public void showDialog(Parent parent, Parent content, Collection<PathRouteModel> paths) {
public PathRouteModel showDialog(Parent parent, Parent content, Collection<PathRouteModel> paths) {
init(paths);
@@ -50,9 +45,12 @@ public class PathsController {
dlg.setContent(content);
dlg.getActions().addAll(OK, Dialog.Actions.CANCEL);
dlg.setResizable(false);
dlg.show();
return dlg.show() == OK ? getPath() : null;
}
public PathRouteModel getPath(){
return tblPaths.getSelectionModel().getSelectedItem();
}
private void init(Collection<PathRouteModel> paths) {
tblPaths.getSelectionModel().clearSelection();

57
client/src/main/java/ru/trader/controllers/RoutersController.java
View File

@@ -6,12 +6,11 @@ import javafx.collections.ListChangeListener;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TableView;
import ru.trader.model.MarketModel;
import ru.trader.model.OfferDescModel;
import ru.trader.model.OrderModel;
import ru.trader.model.VendorModel;
import ru.trader.model.*;
import ru.trader.view.support.NumberField;
import ru.trader.view.support.RouteNode;
import java.util.Collection;
@@ -30,6 +29,9 @@ public class RoutersController {
@FXML
private NumberField jumps;
@FXML
private ScrollPane path;
@FXML
private Button add;
@@ -60,9 +62,9 @@ public class RoutersController {
balance.setValue(1000);
cargo.setValue(4);
tank.setValue(30);
tank.setValue(20);
distance.setValue(7);
jumps.setValue(4);
jumps.setValue(3);
add.disableProperty().bind(this.balance.wrongProperty().or(this.cargo.wrongProperty()));
tblOrders.setItems(FXCollections.observableArrayList());
@@ -87,7 +89,8 @@ public class RoutersController {
market = MainController.getMarket();
source.setItems(market.vendorsProperty());
source.getSelectionModel().selectFirst();
target.setItems(market.vendorsProperty());
target.setItems(FXCollections.observableArrayList(market.vendorsProperty()));
target.getItems().add(0, null);
tblOrders.getItems().clear();
totalBalance.setValue(balance.getValue());
totalProfit.setValue(0);
@@ -129,6 +132,7 @@ public class RoutersController {
tblOrders.getItems().clear();
totalBalance.setValue(balance.getValue());
totalProfit.setValue(0);
path.setContent(null);
}
@@ -139,14 +143,45 @@ public class RoutersController {
}
}
public void showOrders(){
VendorModel s = source.getSelectionModel().getSelectedItem();
VendorModel t = target.getSelectionModel().getSelectedItem();
OrderModel order;
if (t==null){
order = Screeners.showTopOrders(market.getOrders(s, totalBalance.getValue().doubleValue()));
} else {
order = Screeners.showTopOrders(market.getOrders(t, s, totalBalance.getValue().doubleValue()));
}
if (order!=null){
tblOrders.getItems().add(order);
}
}
public void showRoutes(){
VendorModel s = source.getSelectionModel().getSelectedItem();
VendorModel t = target.getSelectionModel().getSelectedItem();
if (t==null) return;
MarketModel market = MainController.getMarket();
Screeners.showRouters(market.getRouters(s, t, totalBalance.getValue().doubleValue()));
PathRouteModel path;
if (t==null){
path = Screeners.showRouters(market.getRoutes(s, totalBalance.getValue().doubleValue()));
} else {
path = Screeners.showRouters(market.getRoutes(s, t, totalBalance.getValue().doubleValue()));
}
if (path!=null){
tblOrders.getItems().addAll(path.getOrders());
setPath(path);
}
}
public void showTopRoutes(){
PathRouteModel path = Screeners.showRouters(market.getTopRoutes(totalBalance.getValue().doubleValue()));
if (path!=null){
tblOrders.getItems().addAll(path.getOrders());
setPath(path);
}
}
private void setPath(PathRouteModel route){
path.setContent(new RouteNode(route).getNode());
}
}

4
client/src/main/java/ru/trader/controllers/Screeners.java
View File

@@ -160,7 +160,7 @@ public class Screeners {
return topOrdersController.showDialog(mainScreen, topOrdersScreen, top);
}
public static void showRouters(ObservableList<PathRouteModel> routers) {
pathsController.showDialog(mainScreen, pathsScreen, routers);
public static PathRouteModel showRouters(ObservableList<PathRouteModel> routers) {
return pathsController.showDialog(mainScreen, pathsScreen, routers);
}
}

41
client/src/main/java/ru/trader/model/MarketModel.java
View File

@@ -3,11 +3,11 @@ package ru.trader.model;
import javafx.beans.property.ListProperty;
import javafx.beans.property.ReadOnlyListProperty;
import javafx.beans.property.SimpleListProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.core.*;
import ru.trader.graph.PathRoute;
import ru.trader.model.support.BindingsHelper;
import ru.trader.model.support.ChangeMarketListener;
@@ -169,15 +169,15 @@ public class MarketModel {
return ModelFabrica.getModel(vendor, this);
}
public ObservableList<OrderModel> getTop(int limit, double balance){
return BindingsHelper.observableList(analyzer.getTop(limit, balance), (o) -> {
OrderModel model = new OrderModel(asOfferDescModel(o.getSell()), balance, analyzer.getCargo());
model.setBuyer(asModel(o.getBuy()));
model.setCount(model.getMax());
return model;
});
public OrderModel asModel(Order order) {
return new OrderModel(asOfferDescModel(order.getSell()), asModel(order.getBuy()), order.getCount());
}
public PathRouteModel asModel(PathRoute path) {
return new PathRouteModel(path, this);
}
public void setCargo(long cargo){
analyzer.setCargo(cargo);
}
@@ -194,7 +194,28 @@ public class MarketModel {
analyzer.setMaxDistance(distance);
}
public ObservableList<PathRouteModel> getRouters(VendorModel from, VendorModel to, double balance){
return BindingsHelper.observableList(analyzer.getPaths(from.getVendor(), to.getVendor(), balance), PathRouteModel::new);
public ObservableList<OrderModel> getOrders(VendorModel from, double balance) {
return BindingsHelper.observableList(analyzer.getOrders(from.getVendor(), balance), this::asModel);
}
public ObservableList<OrderModel> getOrders(VendorModel from, VendorModel to, double balance) {
return BindingsHelper.observableList(analyzer.getOrders(from.getVendor(), to.getVendor(), balance), this::asModel);
}
public ObservableList<OrderModel> getTop(int limit, double balance){
return BindingsHelper.observableList(analyzer.getTop(limit, balance), this::asModel);
}
public ObservableList<PathRouteModel> getRoutes(VendorModel from, double balance){
return BindingsHelper.observableList(analyzer.getPaths(from.getVendor(), balance), this::asModel);
}
public ObservableList<PathRouteModel> getRoutes(VendorModel from, VendorModel to, double balance){
return BindingsHelper.observableList(analyzer.getPaths(from.getVendor(), to.getVendor(), balance), this::asModel);
}
public ObservableList<PathRouteModel> getTopRoutes(double balance){
return BindingsHelper.observableList(analyzer.getTopPaths(100, balance), this::asModel);
}
}

7
client/src/main/java/ru/trader/model/OrderModel.java
View File

@@ -31,6 +31,13 @@ public class OrderModel {
};
}
public OrderModel(OfferDescModel sellOffer, OfferModel buyOffer, long max) {
this(sellOffer);
this.max = max;
setBuyer(buyOffer);
setCount(max);
}
public OrderModel(OfferDescModel offer, double balance, long limit) {
this(offer);
this.max = Math.min(limit, (long) Math.floor(balance / offer.getPrice()));

44
client/src/main/java/ru/trader/model/PathRouteModel.java
View File

@@ -1,28 +1,35 @@
package ru.trader.model;
import ru.trader.core.Vendor;
import ru.trader.core.Order;
import ru.trader.graph.PathRoute;
import java.util.ArrayList;
import java.util.Collection;
public class PathRouteModel {
private final MarketModel market;
private final double distance;
private final double totalProfit;
private final int jumps;
private final int refuels;
private final int lands;
private final PathRoute path;
public PathRouteModel(PathRoute path) {
PathRouteModel(PathRoute path, MarketModel market) {
this.market = market;
this.path = path;
PathRoute p = path.getRoot();
double pr =0, d = 0; int j = 0, r = 0;
totalProfit = p.getProfit();
double d = 0; int j = 0, r = 0, l = 0;
while (p.hasNext()){
p = p.getNext();
d += path.getDistance();
pr += p.getMaxProfit();
d += p.getDistance();
j++;
if (p.isRefill()) r++;
if (p.getBest() != null || p.isRefill()) l++;
}
totalProfit = pr;
lands = l;
distance = d;
jumps = j;
refuels = r;
@@ -47,4 +54,29 @@ public class PathRouteModel {
public PathRoute getPath() {
return path;
}
public int getLands() {
return lands;
}
public double getAvgProfit(){
return totalProfit/lands;
}
public Collection<OrderModel> getOrders(){
Collection<OrderModel> res = new ArrayList<>(lands);
PathRoute p = path.getRoot();
Order cargo = null;
while (p.hasNext()){
p = p.getNext();
if (cargo == null && p.getBest()!=null){
cargo = p.getBest();
res.add(market.asModel(cargo));
}
if (cargo!=null && cargo.isBuyer(p.get())){
cargo = null;
}
}
return res;
}
}

86
client/src/main/java/ru/trader/view/support/RouteNode.java Normal file
View File

@@ -0,0 +1,86 @@
package ru.trader.view.support;
import javafx.scene.Node;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import org.controlsfx.glyphfont.GlyphFontRegistry;
import ru.trader.core.Order;
import ru.trader.graph.PathRoute;
import ru.trader.model.PathRouteModel;
public class RouteNode {
private final static String CSS_PATH = "path";
private final static String CSS_ICONS = "path-icons";
private final static String CSS_TRACK = "path-track";
private final static String CSS_TRACK_TEXT = "path-track-text";
private final static String CSS_VENDOR = "path-vendor";
private final PathRoute path;
private final HBox node = new HBox();
public RouteNode(PathRouteModel path) {
this.path = path.getPath();
node.getStyleClass().add(CSS_PATH);
build();
}
private void build(){
HBox v = new HBox();
VBox icons = new VBox();
VBox track = new VBox();
VBox.setVgrow(track, Priority.ALWAYS);
VBox.setVgrow(icons, Priority.ALWAYS);
v.getStyleClass().add(CSS_VENDOR);
icons.getStyleClass().add(CSS_ICONS);
track.getStyleClass().add(CSS_TRACK);
PathRoute p = path.getRoot();
v.getChildren().add(new Text(p.get().getName()));
Order cargo = null;
while (p.hasNext()){
p = p.getNext();
if (cargo == null && p.getBest() != null){
cargo = p.getBest();
icons.getChildren().add(GlyphFontRegistry.glyph("FontAwesome|UPLOAD_ALT"));
}
if (p.isRefill()) icons.getChildren().add(GlyphFontRegistry.glyph("FontAwesome|REFRESH"));
node.getChildren().addAll(v, icons);
Text t = new Text(String.format("(%.2f LY)", p.getDistance()));
t.getStyleClass().add(CSS_TRACK_TEXT);
track.getChildren().addAll(t, GlyphFontRegistry.glyph("FontAwesome|LONG_ARROW_RIGHT"));
node.getChildren().addAll(track);
v = new HBox();
icons = new VBox();
track = new VBox(0);
VBox.setVgrow(track, Priority.ALWAYS);
VBox.setVgrow(icons, Priority.ALWAYS);
v.getStyleClass().add(CSS_VENDOR);
icons.getStyleClass().add(CSS_ICONS);
track.getStyleClass().add(CSS_TRACK);
v.getChildren().add(new Text(p.get().getName()));
v.getChildren().add(icons);
if (cargo != null && cargo.isBuyer(p.get())){
v.getChildren().add(new Text(String.format(" (%+.0f) ", cargo.getProfit())));
cargo = null;
icons.getChildren().add(GlyphFontRegistry.glyph("FontAwesome|DOWNLOAD_ALT"));
}
}
node.getChildren().addAll(v, icons);
}
public Node getNode() {
return node;
}
}

38
client/src/main/java/ru/trader/view/support/cells/PathRouteCell.java
View File

@@ -1,49 +1,25 @@
package ru.trader.view.support.cells;
import javafx.geometry.Pos;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import javafx.scene.control.TableRow;
import javafx.util.Callback;
import org.controlsfx.glyphfont.GlyphFontRegistry;
import ru.trader.core.Order;
import ru.trader.graph.PathRoute;
import ru.trader.model.PathRouteModel;
import ru.trader.view.support.RouteNode;
public class PathRouteCell<T> implements Callback<TableColumn<PathRouteModel, T>, TableCell<PathRouteModel, T>> {
@Override
public TableCell<PathRouteModel, T> call(TableColumn<PathRouteModel, T> param) {
return new TableCell<PathRouteModel, T>(){
@Override
public void updateItem(T value, boolean empty) {
super.updateItem(value, empty);
if (!empty){
PathRoute p = ((PathRouteModel) getTableRow().getItem()).getPath().getRoot();
HBox hBox = new HBox();
HBox v = new HBox();
v.setAlignment(Pos.BOTTOM_CENTER);
v.getChildren().add(new Text(p.get().getName()));
while (p.hasNext()){
p = p.getNext();
if (p.isRefill()) v.getChildren().add(GlyphFontRegistry.glyph("FontAwesome|REFRESH"));
hBox.getChildren().add(v);
VBox dist = new VBox(new Text(String.format("(%+.0f LY)", p.getDistance())));
dist.setAlignment(Pos.BASELINE_CENTER);
dist.getChildren().add(GlyphFontRegistry.glyph("FontAwesome|LONG_ARROW_RIGHT"));
hBox.getChildren().addAll(dist);
v = new HBox();
v.setAlignment(Pos.BOTTOM_CENTER);
v.getChildren().add(new Text(p.get().getName()));
v.getChildren().add(new Text(String.format(" (%+.0f) ", p.getMaxProfit())));
}
hBox.getChildren().add(v);
TableRow row = getTableRow();
if (!empty && row !=null && row.getItem() != null){
RouteNode route = new RouteNode((PathRouteModel) row.getItem());
setText(null);
setGraphic(hBox);
setGraphic(route.getNode());
} else {
setText(null);
setGraphic(null);