ACS-Like autoresolve #6239

Scoppio · 2024-12-02T02:44:41Z

Alot of the changes for ACS-Like Autoresolve depend heavily in Megamek having a "sane" game interface which allow us detach entities from the gameboard.

However, many of the tools require the current TW Game as a basis, be it to declare a winner, be it to do checks like unit damage, limb blownoff, pilot survival, etc.

This Pull Request has multiple changes that has effect on absolutelly nothing. It just extract interfaces so we can implement and use stubs for the game object, publish end game events, etc. It also has many "weird" changes that do cause big effects, mostly improving initialization times, reducing number of function calls and reducing memory usage. Those changes are not earthshatering, they are more like "the full process takes 300ms, of those, 270ms are spent parsing a file, of that time, 70ms are spent loading the options for the hundreds of equipments, this change reduced from 70ms to 7ms the options loading, reducing the final time to 207ms

It also includes a change to log4j2 so that a developer may simply set an env var and have the logs show up in the console without the need for anything else.

codecov · 2024-12-02T02:49:51Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 28.98%. Comparing base (2e45dc0) to head (d778437).
Report is 9 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #6239      +/-   ##
============================================
- Coverage     28.99%   28.98%   -0.01%     
- Complexity    13982    13986       +4     
============================================
  Files          2652     2656       +4     
  Lines        268296   268423     +127     
  Branches      47764    47787      +23     
============================================
+ Hits          77799    77812      +13     
- Misses       186615   186726     +111     
- Partials       3882     3885       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

megamek/src/megamek/server/victory/VictoryCondition.java

@@ -49,5 +50,5 @@
     * @param context The context to consider, see {@link VictoryCondition} (currently unused)
     * @return The result of the victory condition test
     */
-    VictoryResult checkVictory(Game game, Map<String, Object> context);
+    VictoryResult checkVictory(IGame game, Map<String, Object> context);


megamek/src/megamek/common/net/marshalling/NativeSerializationMarshaller.java

megamek/src/megamek/common/options/Option.java

megamek/src/megamek/common/options/StaticGameOptions.java

+
+    @Override
+    public IOption getOption(String name) {
+        if (tableInfo == null) {


Scoppio · 2024-12-10T04:47:06Z

megamek/mmconf/log4j2.xml

-            <AppenderRef ref="Console" />
+            <AppenderRef ref="${env:mm.profile:-null}" />
        </Logger>
        <Logger name="megamek" level="info" additivity="false">
            <AppenderRef ref="MegaMekLog" />
-            <AppenderRef ref="Console" />
+            <AppenderRef ref="${env:mm.profile:-null}" />
        </Logger>
        <Logger name="megameklab" level="info" additivity="false">
            <AppenderRef ref="MegaMekLabLog" />
-            <AppenderRef ref="Console" />
+            <AppenderRef ref="${env:mm.profile:-null}" />
        </Logger>
        <Logger name="mekhq" level="info" additivity="false">
            <AppenderRef ref="MekHQLog" />
-            <AppenderRef ref="Console" />
+            <AppenderRef ref="${env:mm.profile:-null}" />
        </Logger>

        <Root level="info">
-            <AppenderRef ref="Console" />
+            <AppenderRef ref="MegaMekLog" />
+            <AppenderRef ref="${env:mm.profile:-null}" />


I need to document this somewhere

Scoppio · 2024-12-10T04:47:51Z

megamek/src/megamek/client/generator/RandomUnitGenerator.java

-                long start = System.currentTimeMillis();
+                var stopwatch = StopWatch.create();
+                stopwatch.start();
                rug.populateUnits();
-                long end = System.currentTimeMillis();
-                logger.info("Loaded Rats in: " + (end - start) + "ms.");
+                stopwatch.stop();
+                logger.info("Loaded Rats in: {}", stopwatch.toString());
+                rug.initialized = true;
+                latch.countDown();
            }, "Random Unit Generator unit populater");
            rug.loader.setPriority(Thread.NORM_PRIORITY - 1);
            rug.loader.start();
        }
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            logger.error("Initialization interrupted", e);
+            Thread.currentThread().interrupt();
+        }


substitutes the while sleep loop with a latch await

Scoppio · 2024-12-10T04:50:01Z

megamek/src/megamek/client/ui/swing/lobby/MekForceTreeRenderer.java

-            logger.error("Trying to resize a unit icon of height or width 0!");
+            logger.debug("Trying to resize a unit icon of height or width 0!");


an error should be something that we need to fix, this apparently is here just to tell "hey, the image is not imaging"

Scoppio · 2024-12-10T04:50:13Z

megamek/src/megamek/common/Entity.java

@@ -9901,7 +9874,7 @@ public boolean isEligibleForFiring() {
        }

        // check game options
-        if (!game.getOptions().booleanOption(OptionsConstants.BASE_SKIP_INELIGABLE_FIRING)) {
+        if (!game.getOptions().booleanOption(OptionsConstants.BASE_SKIP_INELIGIBLE_FIRING)) {


Scoppio · 2024-12-10T04:50:53Z

megamek/src/megamek/common/Game.java

@@ -322,10 +329,10 @@ public void setupTeams() {
        Vector<Team> initTeams = new Vector<>();
        boolean useTeamInit = getOptions().getOption(OptionsConstants.BASE_TEAM_INITIATIVE)
                .booleanValue();
-
+        var players = getPlayersList();


return the lpayer list only once.

Scoppio · 2024-12-10T04:52:43Z

megamek/src/megamek/common/options/BasicGameOptions.java

+    private static final Option.OptionValue[] baseOptions = {
+        Option.of(OptionsConstants.BASE_FRIENDLY_FIRE, false),
+        Option.of(OptionsConstants.BASE_SKIP_INELIGIBLE_MOVEMENT, false),
+        Option.of(OptionsConstants.BASE_SKIP_INELIGIBLE_FIRING, false),
+        Option.of(OptionsConstants.BASE_SKIP_INELIGIBLE_PHYSICAL, true),
+        Option.of(OptionsConstants.BASE_TEAM_INITIATIVE, true),
+        Option.of(OptionsConstants.BASE_AUTOSAVE_MSG, true),
+        Option.of(OptionsConstants.BASE_PARANOID_AUTOSAVE, false),
+        Option.of(OptionsConstants.BASE_MAX_NUMBER_ROUND_SAVES, 3),
+        Option.of(OptionsConstants.BASE_EXCLUSIVE_DB_DEPLOYMENT, true),
+        Option.of(OptionsConstants.BASE_BLIND_DROP, false),
+        Option.of(OptionsConstants.BASE_REAL_BLIND_DROP, false),
+        Option.of(OptionsConstants.BASE_SET_ARTY_PLAYER_HOMEEDGE, false),
+        Option.of(OptionsConstants.BASE_SET_DEFAULT_TEAM_1, false),
+        Option.of(OptionsConstants.BASE_SET_PLAYER_DEPLOYMENT_TO_PLAYER0, false),
+        Option.of(OptionsConstants.BASE_RESTRICT_GAME_COMMANDS, false),
+        Option.of(OptionsConstants.BASE_DISABLE_LOCAL_SAVE, false),
+        Option.of(OptionsConstants.BASE_BRIDGECF, 0),
+        Option.of(OptionsConstants.BASE_RNG_TYPE, 1),
+        Option.of(OptionsConstants.BASE_RNG_LOG, false),
+        Option.of(OptionsConstants.BASE_TURN_TIMER_TARGETING, 0),
+        Option.of(OptionsConstants.BASE_TURN_TIMER_MOVEMENT, 0),
+        Option.of(OptionsConstants.BASE_TURN_TIMER_FIRING, 0),
+        Option.of(OptionsConstants.BASE_TURN_TIMER_PHYSICAL, 0),
+        Option.of(OptionsConstants.BASE_TURN_TIMER_ALLOW_EXTENSION, true),
+        Option.of(OptionsConstants.BASE_SUPPRESS_UNIT_TOOLTIP_IN_REPORT_LOG, true),
+        Option.of(OptionsConstants.BASE_GM_CONTROLS_DONE_REPORT_PHASE, false),
+        Option.of(OptionsConstants.BASE_HIDE_UNOFFICIAL, false),
+        Option.of(OptionsConstants.BASE_HIDE_LEGACY, false)
+    };
+
+    private static final Option.OptionValue[] victoryOptions = {
+        Option.of(OptionsConstants.VICTORY_CHECK_VICTORY, true)
+    };
+
+
+    private void addOptions(IBasicOptionGroup group, Option.OptionValue[] options) {
+        for (var entry : options) {
+            addOption(group, entry.getName(), entry.getType(), entry.getValue());
+        }
+    }


Big improvement in performance for loading options

Scoppio · 2024-12-10T04:54:12Z

megamek/src/megamek/common/options/StaticGameOptions.java

+import java.util.HashMap;
+import java.util.Map;
+
+public class StaticGameOptions implements IGameOptions {


Improve performance for auto-resolve scenario simulations by not having to load the same set of options hundreds of times.

Scoppio and others added 8 commits November 30, 2024 10:29

feat: adding acs autoresolve

b972243

feat: add acs support and reports

ab22e92

fix: merge conflicts

e0ad0de

fix: readded missing incremend and send game round

8486e41

feat: acs support

ee8a7d9

fix: null check for mek on location destruction

09d3c5d

Merge branch 'MegaMek:master' into acs-autoresolve

cb4db6d

fix: null check for mek on location destruction

424500c

Scoppio self-assigned this Dec 2, 2024

Scoppio changed the title ~~Acs autoresolve~~ ACS-Like autoresolve [WIP] Dec 2, 2024

github-advanced-security bot found potential problems Dec 2, 2024

View reviewed changes

Scoppio added 4 commits December 5, 2024 22:44

Merge branch 'master' into acs-autoresolve

15fe75b

chore: added some missing docs, copyright notices, etc

58897bc

feat: performance improvements for options and quirks and misc flags

ddd1841

feat: acs-autoresolve implemented

bda9cc0

github-advanced-security bot found potential problems Dec 10, 2024

View reviewed changes

Scoppio added 2 commits December 10, 2024 01:35

Merge branch 'master' into acs-autoresolve

ee9e6ca

fix: rolling back unintended changes to native serialization

4336f1b

Scoppio changed the title ~~ACS-Like autoresolve [WIP]~~ ACS-Like autoresolve Dec 10, 2024

Scoppio commented Dec 10, 2024

View reviewed changes

Scoppio added 2 commits December 10, 2024 10:17

feat: optional options

b23ad42

feat: new log file, rolled back option initialization

d778437

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ACS-Like autoresolve #6239

ACS-Like autoresolve #6239

Scoppio commented Dec 2, 2024 •

edited

Loading

codecov bot commented Dec 2, 2024 •

edited

Loading

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

Scoppio Dec 10, 2024

		logger.error("Trying to resize a unit icon of height or width 0!");
		logger.debug("Trying to resize a unit icon of height or width 0!");

ACS-Like autoresolve #6239

Are you sure you want to change the base?

ACS-Like autoresolve #6239

Conversation

Scoppio commented Dec 2, 2024 • edited Loading

codecov bot commented Dec 2, 2024 • edited Loading

Codecov Report

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio Dec 10, 2024

Choose a reason for hiding this comment

Scoppio commented Dec 2, 2024 •

edited

Loading

codecov bot commented Dec 2, 2024 •

edited

Loading