eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00
Code Issues 123 Wiki Activity

partial replacement of char arrays with std::string; minor updates, fixes and cleanup of mctools

Browse Source
This commit is contained in:
tmj-fstate
2017-01-29 18:12:18 +01:00
parent c3d79e29e2
commit 3c0edb3ec3
10 changed files with 211 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Mover.cpp
View File

@@ -5836,7 +5836,7 @@ bool TMoverParameters::readDList( std::string const &line ) {
++DLISTLINE;
int idx = 0;
parser >> idx;
if( idx >= sizeof( DElist ) ) {
if( idx >= sizeof( RList ) ) {
WriteLog( "Read DList: number of entries exceeded capacity of the data table" );
return false;
}

65
McZapkie/mctools.cpp
View File

@@ -158,7 +158,7 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability)
return false;
}
std::string ReadWord(std::ifstream& infile)
std::string ReadWord(std::ifstream &infile)
{
std::string s = "";
char c;
@@ -176,7 +176,7 @@ std::string ReadWord(std::ifstream& infile)
return s;
}
std::string TrimSpace(std::string &s, int Just)
std::string TrimSpace(std::string &s)
{
/*int ii;
@@ -266,41 +266,6 @@ std::string DWE(std::string s) /*Delete After Equal sign*/
return s;
}
std::string Ld2Sp(std::string const &s) /*Low dash to Space sign*/
{
std::string s2( s );
char tmp[] = { '_', ' ' };
for (int b = 0; b < s2.length(); ++b)
if (s2[b] == tmp[0])
s2[b] = tmp[1];
//{
// if (s[b] == tmp[0])
// s2 = s2 + " ";
// else
// s2 = s2 + s[b];
//}
return s2;
}
std::string Tab2Sp(std::string const &s) /*Tab to Space sign*/
{
std::string s2 = "";
char tmp = (char)9;
for (std::size_t b = 0; b < s.length(); ++b)
//{
// if (s[b] == tmp[0])
// s[b] = tmp[1];
//}
//return s;
{
if (s[b] == tmp)
s2 = s2 + " ";
else
s2 = s2 + s[b];
}
return s2;
}
std::string ExchangeCharInString( std::string const &Source, char const &From, char const &To )
{
std::string replacement; replacement.reserve( Source.size() );
@@ -311,22 +276,6 @@ std::string ExchangeCharInString( std::string const &Source, char const &From, c
} );
return replacement;
/*
int const length = Source.size();
std::string replacement; replacement.reserve( length );
for( int idx = 0; idx < length; ++idx ) {
if( Source[ idx ] != From ) {
replacement += Source[ idx ];
}
else {
if( To != NULL ) {
replacement += To;
}
}
}
return replacement;
*/
}
std::vector<std::string> &Split(const std::string &s, char delim, std::vector<std::string> &elems)
@@ -422,9 +371,12 @@ std::string to_hex_str( int const Value, int const Width )
int stol_def(const std::string &str, const int &DefaultValue)
{
// NOTE: there's good chance this function is bugged, it produced wrong result on at least one occasion
// TODO: rewrite into something more reliable
int result { DefaultValue };
std::stringstream converter;
converter << str;
converter >> result;
return result;
/*
// this function was developed iteratively on Codereview.stackexchange
// with the assistance of @Corbin
std::size_t len = str.size();
@@ -443,6 +395,7 @@ int stol_def(const std::string &str, const int &DefaultValue)
return DefaultValue;
}
return result;
*/
}
std::string ToLower(std::string const &text)

21
McZapkie/mctools.h
View File

@@ -82,16 +82,13 @@ inline double Random(double b)
inline double BorlandTime()
{
std::tm epoch;
epoch.tm_sec = 0;
epoch.tm_min = 0;
epoch.tm_hour = 0;
epoch.tm_mday = 1;
epoch.tm_mon = 0;
epoch.tm_year = 0;
time_t basetime = mktime(&epoch);
time_t raw_t = time(NULL);
return (difftime(raw_t, basetime) / 24) + 2;
auto timesinceepoch = std::time( nullptr );
return timesinceepoch / (24.0 * 60 * 60);
/*
// std alternative
auto timesinceepoch = std::chrono::system_clock::now().time_since_epoch();
return std::chrono::duration_cast<std::chrono::seconds>( timesinceepoch ).count() / (24.0 * 60 * 60);
*/
}
std::string Now();
@@ -110,13 +107,11 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability);
/*operacje na stringach*/
std::string ReadWord( std::ifstream& infile); /*czyta slowo z wiersza pliku tekstowego*/
//std::string Ups(std::string s);
std::string TrimSpace(std::string &s, int Just = CutBoth);
std::string TrimSpace(std::string &s);
char* TrimAndReduceSpaces(const char* s);
std::string ExtractKeyWord(std::string InS, std::string KeyWord); /*wyciaga slowo kluczowe i lancuch do pierwszej spacji*/
std::string DUE(std::string s); /*Delete Until Equal sign*/
std::string DWE(std::string s); /*Delete While Equal sign*/
std::string Ld2Sp(std::string const &s); /*Low dash to Space sign*/
std::string Tab2Sp(std::string const &s); /*Tab to Space sign*/
std::string ExchangeCharInString(std::string const &s, const char &aim, const char &target); // zamienia jeden znak na drugi
std::vector<std::string> &Split(const std::string &s, char delim, std::vector<std::string> &elems);
std::vector<std::string> Split(const std::string &s, char delim);