Add score computation #144

flyingtof · 2023-09-02T22:36:56Z

No description provided.

apps/fxc-front/src/app/logic/track.ts

vicb

I left some quick comments.

Could you please describe what's working, what needs to be improved, what is not working.

Merci!

apps/fxc-front/src/app/components/2d/planner-element.ts

vicb · 2023-09-21T08:25:29Z

apps/fxc-front/src/app/components/2d/planner-element.ts

        <div>
          <div>${this.score.circuit}</div>
          <div class="large">
            ${unsafeHTML(units.formatUnit(this.score.distance / 1000, this.units.distance, undefined, 'unit'))}
          </div>
        </div>
        <div class="collapsible">
-          <div>Points = ${this.getMultiplier()}</div>
+          <div>Points = ${this.getMultiplier()} <br/>${this.league}</div>


Maybe move the league to it's own div below and hide it on mobile

Moved into a div.
Is there a standard way to hide a div on mobile?

<div class="collapsible"> should do the trick.

You can test the mobile view with the Chrome developper tools

(second icon from the left on the top bar)

adding collapsible class is not sufficient. The collapse button on the bottom is not visible on mobile devices.
I added a another class and the league information will not be visible on devices with less than a minimum height (767px)

apps/fxc-front/src/app/components/ui/main-menu.ts

apps/fxc-front/src/app/logic/score/improvedScorer.ts

apps/fxc-front/src/app/logic/score/league.ts

vicb · 2023-09-21T08:42:16Z

apps/fxc-front/src/app/logic/score/league/czech.ts

@@ -27,6 +28,7 @@ abstract class CZXCBase {

 export class CzechLocal extends CZXCBase {
  name = 'Czech (ČPP local)';
+  code: LeagueCode = 'czl';


There might be a better way to do this - see how it's done for the tracker at https://github.com/vicb/flyxc/blob/2b869f5bc06ce845e5b58f84642ab3e7cd2f044b/libs/common/src/lib/live-track.ts#L37 and up

Not sure it is the same thing... or may be I dont understand. I added some comments in code. Tell me if it's ok or if I am missing something.

apps/fxc-front/src/app/logic/score/scorer.ts

flyingtof · 2023-10-10T05:31:53Z

There are some issues not resolved yet.
The solution is working, according to my personal tests.
There is still an issue when you compute the score twice on the same track (the distance displayed becomes incorrect), but I think that this was an already existing issue.

vicb · 2023-10-10T07:15:52Z

There are some issues not resolved yet. The solution is working, according to my personal tests. There is still an issue when you compute the score twice on the same track (the distance displayed becomes incorrect),

Do you mean that it's correct the first time and become wrong the second time?

but I think that this was an already existing issue.

How would the issue be triggered with the current code?

vicb

A couple comments.
I'll take a close look in the coming days.
Thanks!

vicb · 2023-10-10T07:13:06Z

apps/fxc-front/src/app/components/2d/planner-element.ts

        <div>
          <div>${this.score.circuit}</div>
          <div class="large">
            ${unsafeHTML(units.formatUnit(this.score.distance / 1000, this.units.distance, undefined, 'unit'))}
          </div>
        </div>
        <div class="collapsible">
-          <div>Points = ${this.getMultiplier()}</div>
+          <div>Points = ${this.getMultiplier()} <br/>${this.league}</div>


<div class="collapsible"> should do the trick.

You can test the mobile view with the Chrome developper tools

(second icon from the left on the top bar)

flyingtof · 2023-10-10T21:02:53Z

There are some issues not resolved yet. The solution is working, according to my personal tests. There is still an issue when you compute the score twice on the same track (the distance displayed becomes incorrect),

Do you mean that it's correct the first time and become wrong the second time?

exactly

but I think that this was an already existing issue.

How would the issue be triggered with the current code?

I meant that I had this issue with my code from the beginning.

After re-reading the code, I think I found the cause : It is a problem of units (meters vs kilometers).
In improvedScorer.ts
If I replace

function toScore(solution: Solution): Score {
  return new Score({
    distance: solution.scoreInfo?.distance,
...

by

function toScore(solution: Solution): Score {
  return new Score({
    distance: (solution.scoreInfo?.distance || 0) * 1000,
...

The problem is over.

But I can't explain for sure why it was working the first time you compute the score and not the second time. I would suspect that a state somewhere is not cleaned / initialized properly.

flyingtof · 2023-10-10T21:08:48Z

There is still sometimes a little difference between score computed the first time and the second time on the same track.
It depends on the track you use in your test. If you want to see that, you can use the test files in igc-xc-score lib
The difference is visible with this file : trifai-xcontest-189.65.igc.

An improvement could be to use the igc-xc-score solver in the League subclasses.
Another way to improve the solution could be to re-design the planner mechanisms.

vicb · 2023-10-20T20:06:05Z

CONTRIBUTING.md

+- `gcloud components install cloud-datastore-emulator`
+
+***run:***
+- `gcloud beta emulators datastore start`


See https://cloud.google.com/sdk/gcloud/reference/beta/emulators/datastore

I think it's good to specify a --data-dir inside the project then it's easy to delete this folder to start with a fresh DB.

You can also use eval $(gcloud beta emulators datastore env-init --data-dir=DATA-DIR) for setting the env vars

ok. Documentation fixed

- also add a first step for using docker containers for development

- use igc-xc-score - first implementation with quick and dirty UI for scoring - no result visible in UI

- may be not the best solution as other computations are performed by the existing code

…core solver - display planner menu after loading a track - close main menu after loading a track - 'compute score' menu item displayed when there is a current track - show current league in planner menu

- also keep dependencies of igx-xc-score only in improvedScorer.ts

…solver API

…omputation

- Add more info (class, type, activity) - Max zoom is now 10 instead of 12

- use igc-xc-score - first implementation with quick and dirty UI for scoring - no result visible in UI

- may be not the best solution as other computations are performed by the existing code

…solver API

…omputation

on mobile devices, the planner menu can be too high, and it can't be hidden (hide button is hidden by the speed/altitude/vario pannel)

use values returned by the scorer to compute the mean speed

flyingtof · 2024-05-02T22:57:45Z

I think I have replied to your remarks.

The only one I did not catch is this one: Add score computation #144 (comment).
FYI, I've just added the computation of the mean speed using data computed from track, instead of using the default value (20km/h). I find this more useful for the user.
I had some issues when rebasing... this branch is quite old now :-/

vicb · 2024-05-05T15:14:15Z

@flyingtof it would be easier to split this work into multiples CLs.

A possible split would be:

First CL:

Create a solver function taking a (flyxc) track and a contest (and options). It would return an object with an optimize method that optimize the track sync.

There should be an enum with all the contests currently supported.

This lib should probably lives in a libs/optimizer folder (use nx create ...) to bootstrap the library.

This lib is only a wrapper around the solver function from igc-xc-score, should be quite thin.

There should be tests:

a track with 2 points,
3 points: free flight, triangle, FAI
I think we should tests all the rules for the French CFD and XContest
We can also test a few real tracks for all of the supported contests.

Second CL

Add a getGenerator({maxCycleTimeMs: number}) to the return object of the solver function.

This function should be called mutliple time to optimize a track (as should the solver function from igc-xc-score)

Update the test to also test this API.

Third CL

Replace the current scorer with this new API - note that it is only used to optimize route, not track.

Fourth CL

Add the ability to score track - as you have implemented in the current CL.

I think you should drive each CL to completion/merge before working on the next one. It will be much easier to review this way. The best way could be to leave this CL as is and start new CLs based on master.

After that we should add the ability to score live tracks too.

What do you think ?

flyingtof · 2024-05-08T08:53:17Z

I agree. We can consider this pr as a prototype and rebuild features step by step

flyingtof commented Sep 2, 2023

View reviewed changes

apps/fxc-front/src/app/logic/track.ts Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

vicb reviewed Sep 21, 2023

View reviewed changes

christophe-taret-zenika force-pushed the add-score-computation branch 4 times, most recently from abcef4d to 1f2e3cf Compare October 10, 2023 05:31

christophe-taret-zenika force-pushed the add-score-computation branch from 1f2e3cf to c10b1b5 Compare October 10, 2023 06:33

vicb reviewed Oct 10, 2023

View reviewed changes

vicb force-pushed the add-score-computation branch from f3b31dc to 04a2547 Compare October 20, 2023 19:53

vicb reviewed Oct 20, 2023

View reviewed changes

vicb force-pushed the master branch from b7ef2ae to 3d2f56f Compare March 5, 2024 14:47

flyingtof and others added 14 commits May 3, 2024 00:37

chore: add a documentation for contributors

4b0ba0f

- also add a first step for using docker containers for development

feat: add support for score computation

46c5d48

- use igc-xc-score - first implementation with quick and dirty UI for scoring - no result visible in UI

feat: visualise computed score in planner

1f04143

- may be not the best solution as other computations are performed by the existing code

refactor(scoring): isolate new scoring code and complete leagues rules

d2d3387

style: reformat code

247e5e7

feat(scoring): move score computation to planner menu and lazy load s…

61ce6ad

…core solver - display planner menu after loading a track - close main menu after loading a track - 'compute score' menu item displayed when there is a current track - show current league in planner menu

refactor(scoring): try to use new scorer in leagues classes

1de70aa

- also keep dependencies of igx-xc-score only in improvedScorer.ts

polish: add comments, suppress dead code and comply more strictly to …

1f0ad03

…solver API

fix(score): wrong initialization of distance to display after score c…

0899098

…omputation

Refactor airspaces:

e173824

- Add more info (class, type, activity) - Max zoom is now 10 instead of 12

feat: add support for score computation

54ef6a1

- use igc-xc-score - first implementation with quick and dirty UI for scoring - no result visible in UI

feat: visualise computed score in planner

bf4d910

- may be not the best solution as other computations are performed by the existing code

style: reformat code

4a3f4c5

polish: add comments, suppress dead code and comply more strictly to …

1de8696

…solver API

flyingtof added 4 commits May 3, 2024 00:49

fix(score): wrong initialization of distance to display after score c…

7cea311

…omputation

feat: do not show league in planner menu on mobile devices

97ea035

on mobile devices, the planner menu can be too high, and it can't be hidden (hide button is hidden by the speed/altitude/vario pannel)

feat: show computed mean speed of a flight in planner

eb07ca3

use values returned by the scorer to compute the mean speed

polish: linting and remove irrelevant doc fragment

b12829d

christophe-taret-zenika force-pushed the add-score-computation branch from a9c8ced to b12829d Compare May 2, 2024 22:49

flyingtof marked this pull request as ready for review May 2, 2024 22:50

flyingtof marked this pull request as draft May 17, 2024 15:38

flyingtof closed this Jun 4, 2024

flyingtof deleted the add-score-computation branch June 4, 2024 17:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add score computation #144

Add score computation #144

flyingtof commented Sep 2, 2023

This comment was marked as outdated.

vicb left a comment

vicb Sep 21, 2023

flyingtof Oct 10, 2023 •

edited

Loading

vicb Oct 10, 2023

flyingtof May 2, 2024

vicb Sep 21, 2023

flyingtof Oct 10, 2023

flyingtof commented Oct 10, 2023

vicb commented Oct 10, 2023

vicb left a comment

vicb Oct 10, 2023

flyingtof commented Oct 10, 2023

flyingtof commented Oct 10, 2023 •

edited

Loading

vicb Oct 20, 2023

flyingtof May 2, 2024

flyingtof commented May 2, 2024

vicb commented May 5, 2024 •

edited

Loading

flyingtof commented May 8, 2024

Add score computation #144

Add score computation #144

Conversation

flyingtof commented Sep 2, 2023

This comment was marked as outdated.

vicb left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flyingtof Oct 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flyingtof commented Oct 10, 2023

vicb commented Oct 10, 2023

vicb left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flyingtof commented Oct 10, 2023

flyingtof commented Oct 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flyingtof commented May 2, 2024

vicb commented May 5, 2024 • edited Loading

flyingtof commented May 8, 2024

flyingtof Oct 10, 2023 •

edited

Loading

flyingtof commented Oct 10, 2023 •

edited

Loading

vicb commented May 5, 2024 •

edited

Loading