Apply clang-tidy fixes

Move fixed point LUT generator scripts to misc/scripts

Author: Spartan322

misc/scripts/exp_lut_generator.py

@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+import os
+from argparse import ArgumentParser
+from math import e
+from typing import List
+
+BIT_COUNT = 64
+MAX_VALUE = 2**BIT_COUNT
+
+DEFAULT_DIVISOR_BASE = 2
+DEFAULT_DIVISOR_POWER = 16
+DEFAULT_EXP_BASE = e
+
+
+def generate_exp_lut(divisor_base: int, divisor_power: int, exp_base: float):
+    divisor: int = divisor_base**divisor_power
+
+    exp_lut: List[int] = []
+
+    for index in range(BIT_COUNT):
+        exponent = (2**index) / divisor
+        value = int((exp_base**exponent) * divisor + 0.5)
+        if value > MAX_VALUE:
+            break
+        exp_lut.append(value)
+
+    lut_identifier: str = (
+        f"LUT_{divisor_base}_{divisor_power}_EXP_{'e' if exp_base == e else ('%g' % exp_base).replace('.', 'p')}"
+    )
+    lut_size: int = len(exp_lut)
+
+    generated_options = ""
+    if (
+        DEFAULT_DIVISOR_BASE is not divisor_base
+        or DEFAULT_DIVISOR_POWER is not divisor_power
+        or DEFAULT_EXP_BASE is not exp_base
+    ):
+        generated_options += " with `"
+
+        if DEFAULT_DIVISOR_BASE is not divisor_base:
+            generated_options += f"-b {divisor_base}"
+            if DEFAULT_DIVISOR_POWER is not divisor_power or DEFAULT_EXP_BASE is not exp_base:
+                generated_options += " "
+
+        if DEFAULT_DIVISOR_POWER is not divisor_power:
+            generated_options += f"-p {divisor_power}"
+            if DEFAULT_EXP_BASE is not exp_base:
+                generated_options += " "
+
+        if DEFAULT_EXP_BASE is not exp_base:
+            generated_options += f"-e {exp_base:g}"
+
+        generated_options += "`"
+
+    source: str = f"""// This file was generated using the `misc/scripts/exp_lut_generator.py` script{generated_options}.
+
+#pragma once
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+
+static constexpr int64_t {lut_identifier}_DIVISOR = {divisor};
+static constexpr size_t {lut_identifier}_SIZE = {lut_size};
+
+static constexpr std::array<int64_t, {lut_identifier}_SIZE> {lut_identifier} {{
+"""
+
+    for value in exp_lut[:-1]:
+        source += f"\t{value},\n"
+
+    source += f"\t{exp_lut[-1]}\n"
+    source += "};\n"
+
+    fixed_point_lut_path: str = os.path.join(
+        os.path.dirname(__file__), f"../../src/openvic-simulation/types/fixed_point/FixedPoint{lut_identifier}.hpp"
+    )
+    with open(fixed_point_lut_path, "w", newline="\n") as file:
+        file.write(source)
+
+    print(f"`FixedPoint{lut_identifier}.hpp` generated successfully.")
+
+
+if __name__ == "__main__":
+    parser = ArgumentParser(
+        prog="Fixed Point Exp LUT Generator", description="Fixed-Point Exponential Look-Up Table generator"
+    )
+    parser.add_argument(
+        "-b",
+        "--base",
+        type=int,
+        default=DEFAULT_DIVISOR_BASE,
+        choices=range(2, 65),
+        help="The base of the fixed point divisor",
+    )
+    parser.add_argument(
+        "-p",
+        "--power",
+        type=int,
+        default=DEFAULT_DIVISOR_POWER,
+        choices=range(1, 65),
+        help="The power of the fixed point divisor",
+    )
+    parser.add_argument(
+        "-e",
+        "--exp",
+        type=float,
+        default=DEFAULT_EXP_BASE,
+        help="The base of the exponential function the look-up table represents",
+    )
+    args = parser.parse_args()
+
+    generate_exp_lut(args.base, args.power, args.exp)
+    exit(0)

misc/scripts/sin_lut_generator.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+import os
+from argparse import ArgumentParser
+from math import pi, sin
+
+DEFAULT_PRECISION = 16
+DEFAULT_COUNT = 9
+
+
+def generate_sin_lut(precision: int, count_log2: int):
+    one = 1 << precision
+    count = 1 << count_log2
+
+    SinLut = []
+
+    for i in range(count):
+        angle = 2 * pi * i / count
+
+        sin_value = sin(angle)
+        moved_sin = sin_value * one
+        rounded_sin = int(moved_sin + 0.5) if moved_sin > 0 else int(moved_sin - 0.5)
+        SinLut.append(rounded_sin)
+
+    SinLut.append(SinLut[0])
+
+    generated_options = ""
+    if DEFAULT_PRECISION is not precision or DEFAULT_COUNT is not count_log2:
+        generated_options += " with `"
+
+        if DEFAULT_PRECISION is not precision:
+            generated_options += f"-p {precision}"
+            if DEFAULT_COUNT is not count_log2:
+                generated_options += " "
+
+        if DEFAULT_COUNT is not count_log2:
+            generated_options += f"-c {count_log2}"
+
+        generated_options += "`"
+
+    source = f"""// This file was generated using the `misc/scripts/sin_lut_generator.py` script{generated_options}.
+
+#pragma once
+
+#include <cstdint>
+
+static constexpr int32_t SIN_LUT_PRECISION = {precision};
+static constexpr int32_t SIN_LUT_COUNT_LOG2 = {count_log2};
+static constexpr int32_t SIN_LUT_SHIFT = SIN_LUT_PRECISION - SIN_LUT_COUNT_LOG2;
+
+static constexpr int64_t SIN_LUT[(1 << SIN_LUT_COUNT_LOG2) + 1] = {{
+"""
+
+    VALS_PER_LINE = 16
+
+    lines = [SinLut[i : i + VALS_PER_LINE] for i in range(0, len(SinLut), VALS_PER_LINE)]
+
+    for line in lines[:-1]:
+        source += f"\t{', '.join(str(value) for value in line)},\n"
+
+    source += f"\t{', '.join(str(value) for value in lines[-1])}\n"
+    source += "};\n"
+
+    fixed_point_sin_path: str = os.path.join(
+        os.path.dirname(__file__), "../../src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp"
+    )
+    with open(fixed_point_sin_path, "w", newline="\n") as file:
+        file.write(source)
+
+    print("`FixedPointLUT_sin.hpp` generated successfully.")
+
+
+if __name__ == "__main__":
+    parser = ArgumentParser(prog="Fixed Point Sin LUT Generator", description="Fixed-Point Sin Look-Up Table generator")
+    parser.add_argument(
+        "-p",
+        "--precision",
+        type=int,
+        default=DEFAULT_PRECISION,
+        choices=range(1, 65),
+        help="The number of bits after the point (fractional bits)",
+    )
+    parser.add_argument(
+        "-c",
+        "--count",
+        type=int,
+        default=DEFAULT_COUNT,
+        choices=range(1, 65),
+        help="The base 2 log of the number of values in the look-up table (must be <= precision)",
+    )
+    args = parser.parse_args()
+
+    if args.precision < args.count:
+        print("ERROR: invalid count ", args.count, " - can't be greater than precision (", args.precision, ")")
+        exit(-1)
+    else:
+        generate_sin_lut(args.precision, args.count)
+        exit(0)

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -108,7 +108,7 @@ Dataloader::path_vector_t Dataloader::_lookup_files_in_dir(
 	path_vector_t ret;
 	struct file_entry_t {
 		fs::path file;
-		fs::path const* root;
+		fs::path const* root = nullptr;
 	};
 	string_map_t<file_entry_t> found_files;
 	for (fs::path const& root : roots) {

src/openvic-simulation/dataloader/NodeTools.hpp

@@ -236,10 +236,10 @@ using namespace std::string_view_literals;
 				ONE_OR_MORE = _MUST_APPEAR | _CAN_REPEAT
 			} expected_count;
 			node_callback_t callback;
-			size_t count;
+			size_t count = 0;
 
 			dictionary_entry_t(expected_count_t new_expected_count, node_callback_t&& new_callback)
-				: expected_count { new_expected_count }, callback { MOV(new_callback) }, count { 0 } {}
+				: expected_count { new_expected_count }, callback { MOV(new_callback) } {}
 
 			constexpr bool must_appear() const {
 				return static_cast<uint8_t>(expected_count) & static_cast<uint8_t>(expected_count_t::_MUST_APPEAR);

src/openvic-simulation/dataloader/Vic2PathSearch_Windows.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#ifdef _WIN32
 
 #include <concepts>
 #pragma comment(lib, "advapi32.lib")
@@ -149,7 +150,7 @@ namespace OpenVic::Windows {
 	};
 
 	template<either_char_type RCHAR_T, either_char_type CHAR_T, either_char_type CHAR_T2>
-	std::basic_string<RCHAR_T> ReadRegValue(
+	std::basic_string<RCHAR_T> ReadRegValue( //
 		HKEY root, std::basic_string_view<CHAR_T> key, std::basic_string_view<CHAR_T2> name
 	) {
 		RegistryKey registry_key(root, key, name);
@@ -168,3 +169,4 @@ namespace OpenVic::Windows {
 		return ReadRegValue<RCHAR_T>(root, key_sv, name_sv);
 	}
 }
+#endif

src/openvic-simulation/defines/AIDefines.cpp

@@ -3,46 +3,7 @@
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
-AIDefines::AIDefines()
-  : colony_weight {},
-	administrator_weight {},
-	industryworker_weight {},
-	educator_weight {},
-	soldier_weight {},
-	soldier_fraction {},
-	capitalist_fraction {},
-	production_weight {},
-	spam_penalty {},
-	one_side_max_warscore {},
-	pop_project_investment_max_budget_factor {},
-	relation_limit_no_alliance_offer {},
-	naval_supply_penalty_limit {},
-	chance_build_railroad {},
-	chance_build_naval_base {},
-	chance_build_fort {},
-	chance_invest_pop_proj {},
-	chance_foreign_invest {},
-	tws_awareness_score_low_cap {},
-	tws_awareness_score_aspect {},
-	peace_base_reluctance {},
-	peace_time_duration {},
-	peace_time_factor {},
-	peace_time_factor_no_goals {},
-	peace_war_exhaustion_factor {},
-	peace_war_direction_factor {},
-	peace_war_direction_winning_mult {},
-	peace_force_balance_factor {},
-	peace_ally_base_reluctance_mult {},
-	peace_ally_time_mult {},
-	peace_ally_war_exhaustion_mult {},
-	peace_ally_war_direction_mult {},
-	peace_ally_force_balance_mult {},
-	aggression_base {},
-	aggression_unciv_bonus {},
-	fleet_size {},
-	min_fleets {},
-	max_fleets {},
-	time_before_disband {} {}
+AIDefines::AIDefines() : fleet_size {}, min_fleets {}, max_fleets {} {}
 
 std::string_view AIDefines::get_name() const {
 	return "ai";

src/openvic-simulation/defines/CountryDefines.cpp

@@ -4,93 +4,7 @@ using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
 CountryDefines::CountryDefines()
-  : nationalism_duration {},
-	rebels_hold_capital_success_duration {}, // NOT USED
-	rebel_success_duration {},
-	base_country_tax_efficiency {},
-	base_country_admin_efficiency {},
-	gold_to_cash_rate {},
-	gold_to_worker_pay_rate {},
-	great_power_rank {},
-	lose_great_power_grace_days {},
-	infamy_containment_limit {},
-	max_bureaucracy_percentage {},
-	bureaucracy_percentage_increment {},
-	min_crimefight_percent {},
-	max_crimefight_percent {},
-	admin_efficiency_crimefight_percent {},
-	conservative_increase_after_reform {},
-	campaign_event_base_duration {},
-	campaign_event_min_duration {}, // NOT USED
-	campaign_event_state_duration_modifier {}, // NOT USED
-	campaign_duration {},
-	secondary_power_rank {},
-	colony_to_state_prestige_gain {},
-	colonial_liferating {},
-	base_greatpower_daily_influence {},
-	ai_support_reform {},
-	base_monthly_diplopoints {},
-	diplomat_travel_duration {},
-	province_overseas_penalty {},
-	noncore_tax_penalty {},
-	base_tariff_efficiency {},
-	colony_formed_prestige {},
-	created_cb_valid_time {},
-	loyalty_boost_on_party_win {},
-	movement_radicalism_base {},
-	movement_radicalism_passed_reform_effect {},
-	movement_radicalism_nationalism_factor {},
-	suppression_points_gain_base {},
-	suppress_bureaucrat_factor {},
-	wrong_reform_militancy_impact {},
-	suppression_radicalisation_hit {},
-	country_investment_industrial_score_factor {},
-	unciv_tech_spread_max {},
-	unciv_tech_spread_min {},
-	min_delay_duration_between_reforms {},
-	economic_reform_uh_factor {},
-	military_reform_uh_factor {},
-	wrong_reform_radical_impact {},
-	tech_year_span {},
-	tech_factor_vassal {},
-	max_suppression {},
-	prestige_hit_on_break_country {},
-	min_mobilize_limit {},
-	pop_growth_country_cache_days {},
-	newspaper_printing_frequency {},
-	newspaper_timeout_period {},
-	newspaper_max_tension {},
-	naval_base_supply_score_base {},
-	naval_base_supply_score_empty {},
-	naval_base_non_core_supply_score {},
-	colonial_points_from_supply_factor {},
-	colonial_points_for_non_core_base {},
-	mobilization_speed_base {},
-	mobilization_speed_rails_mult {},
-	colonization_interest_lead {},
-	colonization_influence_lead {},
-	colonization_duration {},
-	colonization_days_between_investment {},
-	colonization_days_for_initial_investment {},
-	colonization_protectorate_province_maintenance {},
-	colonization_colony_province_maintenance {},
-	colonization_colony_industry_maintenance {},
-	colonization_colony_railway_maintenance {},
-	colonization_interest_cost_initial {},
-	colonization_interest_cost_neighbor_modifier {},
-	colonization_interest_cost {},
-	colonization_influence_cost {},
-	colonization_extra_guard_cost {},
-	colonization_release_dominion_cost {},
-	colonization_create_state_cost {},
-	colonization_create_protectorate_cost {},
-	colonization_create_colony_cost {},
-	colonization_colony_state_distance {},
-	colonization_influence_temperature_per_day {},
-	colonization_influence_temperature_per_level {},
-	party_loyalty_hit_on_war_loss {},
-	research_points_on_conquer_mult {},
-	max_research_points {} {}
+	: great_power_rank {}, secondary_power_rank {}, colonial_liferating {}, min_mobilize_limit {} {}
 
 std::string_view CountryDefines::get_name() const {
 	return "country";