[WIP] Add potentialfield overview component #5

thumbnail · 2017-11-12T16:05:54Z

Todo

Add javadoc
~~Might want to find a way to make font bold~~
Refactor List<Function<x, y>>-findfirst logic.
Discuss naming convention for List<Function<X, Y>> classes. Such as PotentialBackground and TeamColorBackground.
Make TeamColorBackground sort the players on teamcolor.
~~I might want PotentialBackground to return null if the value in the INDArray == 0. That allows for a different default background (field-green or something)~~

romni · 2017-11-12T19:22:27Z

src/main/java/io/leonis/subra/gui/field/Field.java

+                      .findFirst()
+                      .orElse(new RGB(0, 0, 0));
+                  graphics.setBackgroundColor(background);
+                  graphics.setForegroundColor(this.visibleTextColor(background));


why not put these two calls in a map after findFirst()?

Since it doesn't matter. The map is only evaluated once as far as I know. I will test this an come back to you

I verified;

IntStream.range(0, 10) .map(i -> { System.out.println(i); return i;}) .findFirst();

Simply prints 0 as expected.

i'm sorry, i meant ifPresent:

component.getBackgrounds().stream() .map(b -> b.apply(position)) .filter(Objects::nonNull) .findFirst() .ifPresent(background -> { graphics.setBackgroundColor(background); graphics.setForegroundColor(this.visibleTextColor(background)); });

Otherwise i don't have a default background/foreground color

if you need it, shouldn't it be configurable?

It can be; but the logic remains the same. Since one point may return values, another may not. If another point doesn't return a specific value it should use the default. But if you only set the default at the beginning as your example suggests; you'll re-use the colors as they were in the previous pass.

romni · 2017-11-12T19:24:49Z

src/main/java/io/leonis/subra/gui/field/PotentialBackground.java

+ */
+public class PotentialBackground implements Function<TerminalPosition, TextColor> {
+  private final Function<Double, TextColor.RGB> gradient;
+  private final INDArray data;


i think the sampling mechanism (FieldGenerator) should be part of this class or be generalized and move to algieba

The idea is that this data field is acquired at the end of our potentialfield-strategy. I don't know how we can effectively couple it to be honest.

i'm not sure what you mean by that, because the value is calculated in single points if it's needed for the strategy. if you need a sampling of the entire field then that is unrelated to the strategy

Yeah but essentially we need to calculate a a subset of all values for the gui; so the gui should receive or be able to retrieve the necessary dataset at one point.

romni · 2017-11-12T19:26:29Z

src/main/java/io/leonis/subra/gui/field/SingleOrientationIndicator.java

+  ){
+    this(character, players.stream()
+        .filter(r -> CardinalDirection.from(r.getOrientation()).equals(cardinalDirection))
+        .map(robot -> offset.withRelative((int)robot.getX(), (int)robot.getY()))


why not Math.floor? if you need rounding then typecasting will not work the same for negative numbers

Math.floor returns the same type; i need to convert the double to an int. for now i don't care too much about whether it's floored or rounded unless there's a good reason to care :)

thumbnail · 2017-11-12T19:42:58Z

src/main/java/io/leonis/subra/gui/field/PotentialBackground.java

+ * @author Jeroen de Jong
+ */
+public class PotentialBackground implements Function<TerminalPosition, TextColor> {
+  private final Function<Double, TextColor.RGB> gradient;


Note to self: change the second generic to an interface instead of a class. Torch should be updated to make Gradient return TextColor first though.

thumbnail · 2017-11-12T19:50:20Z

src/main/java/io/leonis/subra/gui/TestGuI.java

+                    ),
+                    Arrays.asList(
+                        new OrientationIndicator(robots),
+                        balls.stream().collect(Collectors.toMap(b -> new TerminalPosition((int) b.getX(), (int) b.getY()), b -> 'B'))::get,


I want this to be less ambiguous though. @romnous Ideas?

thumbnail · 2017-11-12T19:51:23Z

src/main/java/io/leonis/subra/gui/TestGuI.java

+                    Arrays.asList(
+                        new OrientationIndicator(robots),
+                        balls.stream().collect(Collectors.toMap(b -> new TerminalPosition((int) b.getX(), (int) b.getY()), b -> 'B'))::get,
+                        robots.stream().collect(Collectors.toMap(r -> new TerminalPosition((int)r.getX(), (int)r.getY()), r -> String.valueOf(r.getId()).charAt(0)))::get


I also need a better way to turn an int (1-13) into a (hexadecimal) char (1-C)...

thumbnail · 2017-12-13T14:45:03Z

src/main/java/io/leonis/subra/gui/field/Robots.java

+          graphics.setBackgroundColor(
+              player.getTeamColor() == TeamColor.BLUE ? ANSI.BLUE : ANSI.YELLOW);
+          graphics.setCharacter((int) player.getX(), (int) player.getY(),
+              String.valueOf(player.getId()).charAt(0));


graphics.putString((int) player.getX(), (int) player.getY(), Integer.toHexString(player.getId())

should be fine

thumbnail · 2017-12-13T14:45:52Z

src/main/java/io/leonis/subra/gui/field/Robots.java

+ * @author Jeroen de Jong
+ */
+@AllArgsConstructor
+public class Robots extends AbstractComponent<Robots> {


This should be RobotPositions or maybe even RobotPositionsComponent :')

i'd prefer suffixing with Component

thumbnail · 2017-12-13T14:46:17Z

src/main/java/io/leonis/subra/gui/field/OrientationIndicators.java

+      @Override
+      public TerminalSize getPreferredSize(final OrientationIndicators component) {
+        // TODO This should be determined based on the set of players
+        return new TerminalSize(10, 20);


Maybe component.getParent().getPrefferedSize() could suffice.

thumbnail · 2017-12-13T14:47:44Z

src/main/java/io/leonis/subra/gui/field/FieldLines.java

+                        })));
+      }
+
+      private Character getCharacter(


@RyanMeulenkamp Could you figure out a more beautiful solution for this? It's code to put either an -, | or + for a line.

at least you could turn that ternary into else if and else

It was an ternary expression; but that wasn't much clearer as well.

no i mean

if ((fieldLine.getYStart() == y && fieldLine.getXStart() == x) || (fieldLine.getYEnd() == y && fieldLine.getXEnd() == x)) { return '+'; } else if (fieldLine.getYStart() == fieldLine.getYEnd()) { return '|'; else { return '–'; }

I totally failed in parsing that sentence.

romni · 2017-12-14T08:43:56Z

src/main/java/io/leonis/subra/gui/field/FieldLines.java

+                        })));
+      }
+
+      private Character getCharacter(


at least you could turn that ternary into else if and else

romni · 2017-12-14T08:45:53Z

src/main/java/io/leonis/subra/gui/field/GaussianField.java

+      final S data
+  ) {
+    final BiFunction<Integer, Integer, TextColor> backgroundSupplier = new GaussianPotentialFieldBackground(
+        (GaussianPotentialField) data.getPotentialField(), new Gradient(Color.GREEN, Color.RED)


PotentialField.Supplier in algieba should take a generic type to fix this

Good suggestion!

We need to release it before i can remove the cast though.

romni · 2017-12-14T08:46:33Z

src/main/java/io/leonis/subra/gui/field/GaussianPotentialFieldBackground.java

+
+  @Override
+  public TextColor apply(final Integer x, final Integer y) {
+    final INDArray positionVector = potentialField.getPotential(Nd4j.create(new double[]{x, y}));


should be called potential

don't forget state vectors are column vectors. if you don't specify the dimensions of the array then nd4j will give you a row vector. try this:

potentialField.getPotential(Nd4j.create(new double[]{x, y}, new int[]{2, 1}));

romni · 2017-12-14T08:48:56Z

src/main/java/io/leonis/subra/gui/field/Robots.java

+ * @author Jeroen de Jong
+ */
+@AllArgsConstructor
+public class Robots extends AbstractComponent<Robots> {


i'd prefer suffixing with Component

romni reviewed Nov 12, 2017

View reviewed changes

thumbnail commented Nov 12, 2017

View reviewed changes

thumbnail commented Dec 13, 2017

View reviewed changes

romni reviewed Dec 14, 2017

View reviewed changes

thumbnail added 13 commits December 14, 2017 19:58

Add torch dependency

318b6ab

Initial commit field component

673a5c2

Add mock impls to test fieldcomponent

06d4f2a

Use box-drawing characters for intercardinal directions

a339fa8

Use ARROW-unicode characters

f7ed51c

Add a orange background for balls

2cd4cb1

Draw + wherever a intersection of lines is in the gui

60e7786

Draw horizontal and vertical fieldlines

cb55c25

Refactor field-character-functions into components

13bb34f

Refactor PotentialBackground to accept GaussianPotentialFields

ade840c

Refactor field component to a panel

1a839ab

Fix imports and reformat code

8f0f92e

Remove unused variable

96bae15

thumbnail force-pushed the add_torch branch from 64d95d7 to 96bae15 Compare December 14, 2017 18:59

thumbnail added 2 commits December 14, 2017 21:12

Add javadoc, optimize imports and reorganize code

0586533

Remove test tools from repo

035ef33

thumbnail changed the title ~~Add torch~~ [WIP] Add torch Dec 14, 2017

thumbnail and others added 3 commits December 16, 2017 15:29

Do not express a prefered size

74f6a56

Rename EmptySpace to CanvasComponent

d4f9dbb

update use of potentialfield

cf0ff81

thumbnail changed the title ~~[WIP] Add torch~~ [WIP] Add potentialfield overview component Jan 15, 2018

[WIP] Add potentialfield overview component #5

Are you sure you want to change the base?

[WIP] Add potentialfield overview component #5

Uh oh!

Conversation

thumbnail commented Nov 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Todo

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thumbnail Dec 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

thumbnail commented Nov 12, 2017 •

edited

Loading

thumbnail Dec 13, 2017 •

edited

Loading