mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 12:09:19 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
204 lines
6.1 KiB
C++
204 lines
6.1 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
/*
|
|
MaSzyna EU07 locomotive simulator component
|
|
Copyright (C) 2004 Maciej Czapkiewicz and others
|
|
|
|
*/
|
|
|
|
#include "stdafx.h"
|
|
#include "world/TractionPower.h"
|
|
|
|
#include "utilities/parser.h"
|
|
#include "utilities/Logs.h"
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
TTractionPowerSource::TTractionPowerSource( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {}
|
|
// legacy constructor
|
|
|
|
void TTractionPowerSource::Init(double const u, double const i)
|
|
{ // ustawianie zasilacza przy braku w scenerii
|
|
NominalVoltage = u;
|
|
VoltageFrequency = 0;
|
|
MaxOutputCurrent = i;
|
|
};
|
|
|
|
bool TTractionPowerSource::Load(cParser *parser) {
|
|
|
|
parser->getTokens( 10, false );
|
|
*parser
|
|
>> m_area.center.x
|
|
>> m_area.center.y
|
|
>> m_area.center.z
|
|
>> NominalVoltage
|
|
>> VoltageFrequency
|
|
>> InternalRes
|
|
>> MaxOutputCurrent
|
|
>> FastFuseTimeOut
|
|
>> FastFuseRepetition
|
|
>> SlowFuseTimeOut;
|
|
|
|
std::string token { parser->getToken<std::string>() };
|
|
if( token == "recuperation" ) {
|
|
Recuperation = true;
|
|
}
|
|
else if( token == "section" ) {
|
|
// odłącznik sekcyjny
|
|
// nie jest źródłem zasilania, a jedynie informuje o prądzie odłączenia sekcji z obwodu
|
|
bSection = true;
|
|
}
|
|
// skip rest of the section
|
|
while( false == token.empty()
|
|
&& token != "end" ) {
|
|
|
|
token = parser->getToken<std::string>();
|
|
}
|
|
|
|
if( InternalRes < 0.1 ) {
|
|
// coś mała ta rezystancja była...
|
|
// tak około 0.2, wg
|
|
// http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf
|
|
InternalRes = 0.2;
|
|
}
|
|
return true;
|
|
};
|
|
|
|
bool TTractionPowerSource::Update(double dt)
|
|
{ // powinno być wykonane raz na krok fizyki
|
|
// iloczyn napięcia i admitancji daje prąd
|
|
if( FastFuse || SlowFuse ) {
|
|
TotalCurrent = 0.0;
|
|
}
|
|
if (TotalCurrent > MaxOutputCurrent) {
|
|
|
|
FastFuse = true;
|
|
FuseCounter += 1;
|
|
if (FuseCounter > FastFuseRepetition) {
|
|
|
|
SlowFuse = true;
|
|
ErrorLog( "Power overload: \"" + m_name + "\" disabled for " + std::to_string( SlowFuseTimeOut ) + "s" );
|
|
}
|
|
else {
|
|
ErrorLog( "Power overload: \"" + m_name + "\" disabled for " + std::to_string( FastFuseTimeOut ) + "s" );
|
|
}
|
|
|
|
FuseTimer = 0;
|
|
}
|
|
if (FastFuse || SlowFuse)
|
|
{ // jeśli któryś z bezpieczników zadziałał
|
|
TotalAdmitance = 0;
|
|
FuseTimer += dt;
|
|
if (!SlowFuse)
|
|
{ // gdy szybki, odczekać krótko i załączyć
|
|
if (FuseTimer > FastFuseTimeOut)
|
|
FastFuse = false;
|
|
}
|
|
else if (FuseTimer > SlowFuseTimeOut)
|
|
{
|
|
SlowFuse = false;
|
|
FuseCounter = 0; // dajemy znów szansę
|
|
}
|
|
}
|
|
TotalPreviousAdmitance = TotalAdmitance; // używamy admitancji z poprzedniego kroku
|
|
if (TotalPreviousAdmitance == 0.0)
|
|
TotalPreviousAdmitance = 1e-10; // przynajmniej minimalna upływność
|
|
TotalAdmitance = 1e-10; // a w aktualnym kroku sumujemy admitancję
|
|
return true;
|
|
};
|
|
|
|
double TTractionPowerSource::CurrentGet(double res)
|
|
{ // pobranie wartości prądu przypadającego na rezystancję (res)
|
|
// niech pamięta poprzednią admitancję i wg niej przydziela prąd
|
|
if (SlowFuse || FastFuse)
|
|
{ // czekanie na zanik obciążenia sekcji
|
|
if (res < 100.0) // liczenie czasu dopiero, gdy obciążenie zniknie
|
|
FuseTimer = 0;
|
|
return 0;
|
|
}
|
|
if (res > 0 || (res < 0 && (Recuperation || true)))
|
|
TotalAdmitance += 1.0 / res; // połączenie równoległe rezystancji jest równoważne sumie admitancji
|
|
float NomVolt = TotalPreviousAdmitance < 0 ? static_cast<float>(NominalVoltage * 1.083) : static_cast<float>(NominalVoltage);
|
|
TotalCurrent = TotalPreviousAdmitance != 0.0 ?
|
|
NomVolt / (InternalRes + 1.0 / TotalPreviousAdmitance) :
|
|
0.0; // napięcie dzielone przez sumę rezystancji wewnętrznej i obciążenia
|
|
OutputVoltage = NomVolt - InternalRes * TotalCurrent; // napięcie na obciążeniu
|
|
return TotalCurrent / (res * TotalPreviousAdmitance); // prąd proporcjonalny do udziału (1/res)
|
|
// w całkowitej admitancji
|
|
};
|
|
|
|
void TTractionPowerSource::PowerSet(TTractionPowerSource *ps)
|
|
{ // wskazanie zasilacza w obiekcie sekcji
|
|
if (!psNode[0])
|
|
psNode[0] = ps;
|
|
else if (!psNode[1])
|
|
psNode[1] = ps;
|
|
// else ErrorLog("nie może być więcej punktów zasilania niż dwa");
|
|
};
|
|
|
|
// serialize() subclass details, sends content of the subclass to provided stream
|
|
void
|
|
TTractionPowerSource::serialize_( std::ostream &Output ) const {
|
|
|
|
// TODO: implement
|
|
}
|
|
|
|
// deserialize() subclass details, restores content of the subclass from provided stream
|
|
void
|
|
TTractionPowerSource::deserialize_( std::istream &Input ) {
|
|
|
|
// TODO: implement
|
|
}
|
|
|
|
// export() subclass details, sends basic content of the class in legacy (text) format to provided stream
|
|
void
|
|
TTractionPowerSource::export_as_text_( std::ostream &Output ) const {
|
|
// header
|
|
Output << "tractionpowersource ";
|
|
// placement
|
|
Output
|
|
<< location().x << ' '
|
|
<< location().y << ' '
|
|
<< location().z << ' ';
|
|
// basic attributes
|
|
Output
|
|
<< NominalVoltage << ' '
|
|
<< VoltageFrequency << ' '
|
|
<< InternalRes << ' '
|
|
<< MaxOutputCurrent << ' '
|
|
<< FastFuseTimeOut << ' '
|
|
<< FastFuseRepetition << ' '
|
|
<< SlowFuseTimeOut << ' ';
|
|
// optional attributes
|
|
if( true == Recuperation ) {
|
|
Output << "recuperation ";
|
|
}
|
|
if( true == bSection ) {
|
|
Output << "section ";
|
|
}
|
|
// footer
|
|
Output
|
|
<< "end"
|
|
<< "\n";
|
|
}
|
|
|
|
|
|
|
|
// legacy method, calculates changes in simulation state over specified time
|
|
void
|
|
powergridsource_table::update( double const Deltatime ) {
|
|
|
|
for( auto *powersource : m_items ) {
|
|
powersource->Update( Deltatime );
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------------------------
|