Skip to content

Commit 62a0b9e

Browse files
LisiasLisias
committed
The whole point of reading code is to read code. C++ is already a buttload of cryptic text to be ingested, learning Arabic and Japanese in order to even know what it's being talked about is, frankly, more elitism than cultural respect. Even "ElMikkawy" is less than ideal, I just managed to found the guy looking for "Almekkawy", damnit! **NOW** I know the guy. المكاوى was beyound me!
Revert "Merge pull request mockingbirdnest#1787 from eggrobin/吉田-鈴木"
1 parent b4b404a commit 62a0b9e

21 files changed

Lines changed: 90 additions & 89 deletions

‎astronomy/geodesy_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ TEST_F(GeodesyTest, DISABLED_LAGEOS2) {
146146
final_time,
147147
Ephemeris<ICRS>::AdaptiveStepParameters(
148148
EmbeddedExplicitRungeKuttaNyströmIntegrator<
149-
DormandالمكاوىPrince1986RKN434FM,
149+
DormandElMikkawyPrince1986RKN434FM,
150150
Ephemeris<ICRS>::NewtonianMotionEquation>(),
151151
std::numeric_limits<std::int64_t>::max(),
152152
/*length_integration_tolerance=*/1 * Milli(Metre),

‎astronomy/standard_product_3_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ TEST_P(StandardProduct3DynamicsTest, PerturbedKeplerian) {
388388
it->time,
389389
Ephemeris<ICRS>::AdaptiveStepParameters(
390390
EmbeddedExplicitRungeKuttaNyströmIntegrator<
391-
DormandالمكاوىPrince1986RKN434FM,
391+
DormandElMikkawyPrince1986RKN434FM,
392392
Ephemeris<ICRS>::NewtonianMotionEquation>(),
393393
std::numeric_limits<std::int64_t>::max(),
394394
/*length_integration_tolerance=*/1 * Milli(Metre),

‎benchmarks/apsides_benchmark.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class ApsidesBenchmark : public benchmark::Fixture {
9696
begin->time + 1 * JulianYear,
9797
Ephemeris<ICRS>::AdaptiveStepParameters(
9898
EmbeddedExplicitRungeKuttaNyströmIntegrator<
99-
DormandالمكاوىPrince1986RKN434FM,
99+
DormandElMikkawyPrince1986RKN434FM,
100100
Ephemeris<ICRS>::NewtonianMotionEquation>(),
101101
std::numeric_limits<std::int64_t>::max(),
102102
/*length_integration_tolerance=*/1 * Milli(Metre),

‎benchmarks/embedded_explicit_runge_kutta_nyström_integrator_benchmark.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ void BM_EmbeddedExplicitRungeKuttaNyströmIntegratorSolveHarmonicOscillator3D(
220220

221221
BENCHMARK_TEMPLATE2(
222222
BM_EmbeddedExplicitRungeKuttaNyströmIntegratorSolveHarmonicOscillator1D,
223-
methods::DormandالمكاوىPrince1986RKN434FM, ODE1D)
223+
methods::DormandElMikkawyPrince1986RKN434FM, ODE1D)
224224
->Unit(benchmark::kMillisecond);
225225

226226
BENCHMARK_TEMPLATE2(
227227
BM_EmbeddedExplicitRungeKuttaNyströmIntegratorSolveHarmonicOscillator3D,
228-
methods::DormandالمكاوىPrince1986RKN434FM, ODE3D)
228+
methods::DormandElMikkawyPrince1986RKN434FM, ODE3D)
229229
->Unit(benchmark::kMillisecond);
230230

231231
} // namespace integrators

‎benchmarks/ephemeris_benchmark.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ void FlowEphemerisWithAdaptiveStep(
539539
t,
540540
Ephemeris<Barycentric>::AdaptiveStepParameters(
541541
EmbeddedExplicitRungeKuttaNyströmIntegrator<
542-
DormandالمكاوىPrince1986RKN434FM,
542+
DormandElMikkawyPrince1986RKN434FM,
543543
Ephemeris<Barycentric>::NewtonianMotionEquation>(),
544544
/*max_steps=*/std::numeric_limits<std::int64_t>::max(),
545545
/*length_integration_tolerance=*/1 * Metre,

‎integrators/embedded_explicit_generalized_runge_kutta_nyström_integrator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ using namespace principia::quantities::_quantities;
5353
// consistent with the one we use for Runge-Kutta-Nyström methods (which have no
5454
// a′). However, note that Fine uses ^ for the low order method, whereas we use
5555
// it for the high order method, consistently with the notation used by Dormand,
56-
// المكاوى, and Prince for RKN methods.
56+
// المكاوى (ElMikkawy), and Prince for RKN methods.
5757

5858
// Alternative notations use a and b for the velocity Runge Kutta matrix and
5959
// weights: [Mur98] uses (c, α, a, β̂, b̂, β, b), and [Dor96] uses

‎integrators/embedded_explicit_runge_kutta_nyström_integrator_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest,
7272
HarmonicOscillatorBackAndForth) {
7373
AdaptiveStepSizeIntegrator<ODE> const& integrator =
7474
EmbeddedExplicitRungeKuttaNyströmIntegrator<
75-
methods::DormandالمكاوىPrince1986RKN434FM, ODE>();
75+
methods::DormandElMikkawyPrince1986RKN434FM, ODE>();
7676
Length const x_initial = 1 * Metre;
7777
Speed const v_initial = 0 * Metre / Second;
7878
Time const period = 2 * π * Second;
@@ -178,7 +178,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest,
178178
TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, MaxSteps) {
179179
AdaptiveStepSizeIntegrator<ODE> const& integrator =
180180
EmbeddedExplicitRungeKuttaNyströmIntegrator<
181-
methods::DormandالمكاوىPrince1986RKN434FM, ODE>();
181+
methods::DormandElMikkawyPrince1986RKN434FM, ODE>();
182182
Length const x_initial = 1 * Metre;
183183
Speed const v_initial = 0 * Metre / Second;
184184
Speed const v_amplitude = 1 * Metre / Second;
@@ -312,7 +312,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Singularity) {
312312

313313
AdaptiveStepSizeIntegrator<ODE> const& integrator =
314314
EmbeddedExplicitRungeKuttaNyströmIntegrator<
315-
methods::DormandالمكاوىPrince1986RKN434FM, ODE>();
315+
methods::DormandElMikkawyPrince1986RKN434FM, ODE>();
316316

317317
auto const instance = integrator.NewInstance(problem,
318318
append_state,
@@ -331,7 +331,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Singularity) {
331331
TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Restart) {
332332
AdaptiveStepSizeIntegrator<ODE> const& integrator =
333333
EmbeddedExplicitRungeKuttaNyströmIntegrator<
334-
methods::DormandالمكاوىPrince1986RKN434FM, ODE>();
334+
methods::DormandElMikkawyPrince1986RKN434FM, ODE>();
335335
Length const x_initial = 1 * Metre;
336336
Speed const v_initial = 0 * Metre / Second;
337337
Time const period = 2 * π * Second;
@@ -433,7 +433,7 @@ TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Restart) {
433433
TEST_F(EmbeddedExplicitRungeKuttaNyströmIntegratorTest, Serialization) {
434434
AdaptiveStepSizeIntegrator<ODE> const& integrator =
435435
EmbeddedExplicitRungeKuttaNyströmIntegrator<
436-
methods::DormandالمكاوىPrince1986RKN434FM, ODE>();
436+
methods::DormandElMikkawyPrince1986RKN434FM, ODE>();
437437
Length const x_initial = 1 * Metre;
438438
Speed const v_initial = 0 * Metre / Second;
439439
Time const period = 2 * π * Second;

‎integrators/integrators_body.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
eegrkn_action, eerkn_action, eerk_action) \
3636
PRINCIPIA_INTEGRATOR_CASE(AdaptiveStepSizeIntegrator, \
3737
DORMAND_ELMIKKAWY_PRINCE_1986_RKN_434FM, \
38-
DormandالمكاوىPrince1986RKN434FM, \
38+
DormandElMikkawyPrince1986RKN434FM, \
3939
eerkn_action) \
4040
PRINCIPIA_INTEGRATOR_CASE(AdaptiveStepSizeIntegrator, \
4141
DORMAND_PRINCE_1986_RK_547FC, \
@@ -193,39 +193,39 @@
193193
sprk_action) \
194194
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
195195
SUZUKI_1990, \
196-
鈴木1990, \
196+
Suzuki1990, \
197197
sprk_action) \
198198
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
199199
YOSHIDA_1990_ORDER_6A, \
200-
吉田1990Order6A, \
200+
Yoshida1990Order6A, \
201201
sprk_action) \
202202
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
203203
YOSHIDA_1990_ORDER_6B, \
204-
吉田1990Order6B, \
204+
Yoshida1990Order6B, \
205205
sprk_action) \
206206
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
207207
YOSHIDA_1990_ORDER_6C, \
208-
吉田1990Order6C, \
208+
Yoshida1990Order6C, \
209209
sprk_action) \
210210
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
211211
YOSHIDA_1990_ORDER_8A, \
212-
吉田1990Order8A, \
212+
Yoshida1990Order8A, \
213213
sprk_action) \
214214
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
215215
YOSHIDA_1990_ORDER_8B, \
216-
吉田1990Order8B, \
216+
Yoshida1990Order8B, \
217217
sprk_action) \
218218
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
219219
YOSHIDA_1990_ORDER_8C, \
220-
吉田1990Order8C, \
220+
Yoshida1990Order8C, \
221221
sprk_action) \
222222
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
223223
YOSHIDA_1990_ORDER_8D, \
224-
吉田1990Order8D, \
224+
Yoshida1990Order8D, \
225225
sprk_action) \
226226
PRINCIPIA_INTEGRATOR_CASE(FixedStepSizeIntegrator, \
227227
YOSHIDA_1990_ORDER_8E, \
228-
吉田1990Order8E, \
228+
Yoshida1990Order8E, \
229229
sprk_action)
230230

231231
namespace principia {

‎integrators/methods.hpp‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ struct Fine1987RKNG34 : EmbeddedExplicitGeneralizedRungeKuttaNyström {
546546

547547
// Coefficients from [DEP87a], table 3 (the RKN4(3)4FM).
548548
// Minimizes the 4th order truncation error.
549-
struct DormandالمكاوىPrince1986RKN434FM :
549+
struct DormandElMikkawyPrince1986RKN434FM :
550550
EmbeddedExplicitRungeKuttaNyström {
551551
static constexpr int higher_order = 4;
552552
static constexpr int lower_order = 3;
@@ -1063,8 +1063,9 @@ struct Ruth1983 : SymplecticPartitionedRungeKutta {
10631063

10641064
// Coefficients from [Suz90]; see also the Japanese version:
10651065
// 鈴木 (1990), 量子系のフラクタル経路積分法 と量子コヒーレンス,
1066+
// Suzuki (1990), Fractal Path Integration Method for Quantum Systems and Quantum Coherence,
10661067
// https://www.jstage.jst.go.jp/article/soken/82/3/82_KJ00004703731/_pdf.
1067-
struct 鈴木1990 : SymplecticPartitionedRungeKutta {
1068+
struct Suzuki1990 : SymplecticPartitionedRungeKutta {
10681069
static constexpr int order = 4;
10691070
static constexpr bool time_reversible = true;
10701071
static constexpr int evaluations = 5;
@@ -1090,7 +1091,7 @@ struct 鈴木1990 : SymplecticPartitionedRungeKutta {
10901091
// NOTE(egg): The coefficients were derived from equations 5.4 through 5.17
10911092
// rather than computed from the wᵢ given in tables 1 and 2. The results were
10921093
// then cross-checked against those obtained from the tables.
1093-
struct 吉田1990Order6A : SymplecticPartitionedRungeKutta {
1094+
struct Yoshida1990Order6A : SymplecticPartitionedRungeKutta {
10941095
static constexpr int order = 6;
10951096
static constexpr bool time_reversible = true;
10961097
static constexpr int evaluations = 7;
@@ -1115,7 +1116,7 @@ struct 吉田1990Order6A : SymplecticPartitionedRungeKutta {
11151116
+0.51004341191845769875,
11161117
+0.392256805238778631910}}};
11171118
};
1118-
struct 吉田1990Order6B : SymplecticPartitionedRungeKutta {
1119+
struct Yoshida1990Order6B : SymplecticPartitionedRungeKutta {
11191120
static constexpr int order = 6;
11201121
static constexpr bool time_reversible = true;
11211122
static constexpr int evaluations = 7;
@@ -1140,7 +1141,7 @@ struct 吉田1990Order6B : SymplecticPartitionedRungeKutta {
11401141
+0.72205442492378755359,
11411142
+0.71992408398839154551}}};
11421143
};
1143-
struct 吉田1990Order6C : SymplecticPartitionedRungeKutta {
1144+
struct Yoshida1990Order6C : SymplecticPartitionedRungeKutta {
11441145
static constexpr int order = 6;
11451146
static constexpr bool time_reversible = true;
11461147
static constexpr int evaluations = 7;
@@ -1165,7 +1166,7 @@ struct 吉田1990Order6C : SymplecticPartitionedRungeKutta {
11651166
-0.34812637695304568885,
11661167
+0.72389128119964896645}}};
11671168
};
1168-
struct 吉田1990Order8A : SymplecticPartitionedRungeKutta {
1169+
struct Yoshida1990Order8A : SymplecticPartitionedRungeKutta {
11691170
static constexpr int order = 8;
11701171
static constexpr bool time_reversible = true;
11711172
static constexpr int evaluations = 15;
@@ -1206,7 +1207,7 @@ struct 吉田1990Order8A : SymplecticPartitionedRungeKutta {
12061207
+1.43131625920334216684,
12071208
+0.521213104349852132174}}};
12081209
};
1209-
struct 吉田1990Order8B : SymplecticPartitionedRungeKutta {
1210+
struct Yoshida1990Order8B : SymplecticPartitionedRungeKutta {
12101211
static constexpr int order = 8;
12111212
static constexpr bool time_reversible = true;
12121213
static constexpr int evaluations = 15;
@@ -1247,7 +1248,7 @@ struct 吉田1990Order8B : SymplecticPartitionedRungeKutta {
12471248
-0.42522792949060316509,
12481249
+0.744096146014606550401}}};
12491250
};
1250-
struct 吉田1990Order8C : SymplecticPartitionedRungeKutta {
1251+
struct Yoshida1990Order8C : SymplecticPartitionedRungeKutta {
12511252
static constexpr int order = 8;
12521253
static constexpr bool time_reversible = true;
12531254
static constexpr int evaluations = 15;
@@ -1288,7 +1289,7 @@ struct 吉田1990Order8C : SymplecticPartitionedRungeKutta {
12881289
+0.999190057189585020872,
12891290
+0.314515325105213909024}}};
12901291
};
1291-
struct 吉田1990Order8D : SymplecticPartitionedRungeKutta {
1292+
struct Yoshida1990Order8D : SymplecticPartitionedRungeKutta {
12921293
static constexpr int order = 8;
12931294
static constexpr bool time_reversible = true;
12941295
static constexpr int evaluations = 15;
@@ -1329,7 +1330,7 @@ struct 吉田1990Order8D : SymplecticPartitionedRungeKutta {
13291330
+0.584268791397964334130,
13301331
+0.457422123114821329143}}};
13311332
};
1332-
struct 吉田1990Order8E : SymplecticPartitionedRungeKutta {
1333+
struct Yoshida1990Order8E : SymplecticPartitionedRungeKutta {
13331334
static constexpr int order = 8;
13341335
static constexpr bool time_reversible = true;
13351336
static constexpr int evaluations = 15;
@@ -1386,7 +1387,7 @@ using internal::BlanesMoan2002SRKN14A;
13861387
using internal::BlanesMoan2002SRKN6B;
13871388
using internal::CandyRozmus1991ForestRuth1990;
13881389
using internal::DormandPrince1986RK547FC;
1389-
using internal::DormandالمكاوىPrince1986RKN434FM;
1390+
using internal::DormandElMikkawyPrince1986RKN434FM;
13901391
using internal::EmbeddedExplicitGeneralizedRungeKuttaNyström;
13911392
using internal::EmbeddedExplicitRungeKutta;
13921393
using internal::EmbeddedExplicitRungeKuttaNyström;
@@ -1423,15 +1424,15 @@ using internal::Ruth1983;
14231424
using internal::SymmetricLinearMultistep;
14241425
using internal::SymplecticPartitionedRungeKutta;
14251426
using internal::SymplecticRungeKuttaNyström;
1426-
using internal::吉田1990Order6A;
1427-
using internal::吉田1990Order6B;
1428-
using internal::吉田1990Order6C;
1429-
using internal::吉田1990Order8A;
1430-
using internal::吉田1990Order8B;
1431-
using internal::吉田1990Order8C;
1432-
using internal::吉田1990Order8D;
1433-
using internal::吉田1990Order8E;
1434-
using internal::鈴木1990;
1427+
using internal::Yoshida1990Order6A;
1428+
using internal::Yoshida1990Order6B;
1429+
using internal::Yoshida1990Order6C;
1430+
using internal::Yoshida1990Order8A;
1431+
using internal::Yoshida1990Order8B;
1432+
using internal::Yoshida1990Order8C;
1433+
using internal::Yoshida1990Order8D;
1434+
using internal::Yoshida1990Order8E;
1435+
using internal::Suzuki1990;
14351436
namespace methods = _methods;
14361437

14371438
} // namespace _methods

‎integrators/symplectic_runge_kutta_nyström_integrator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ using namespace principia::quantities::_quantities;
5959
// weights a and the momentum weights b. Note that our indices are 0-based.
6060
// The following notations appear in the literature:
6161
// (a, b) in most treatments of the subject;
62-
// (d, c) in Ruth, 吉田, as well as Forest and Ruth;
62+
// (d, c) in Ruth, Yoshida, as well as Forest and Ruth;
6363
// (B, b) in Sofroniou and Spaletta;
6464
// (<unnamed>, B) in Okunbor and Skeel;
6565
// (<unnamed>, b) in Calvo and Sanz-Serna.

0 commit comments

Comments
 (0)