From be360425a0d516050a27a1b9a1c7eae636bb5f28 Mon Sep 17 00:00:00 2001 From: damon Date: Fri, 15 Jan 2021 18:29:36 +0000 Subject: [PATCH 1/4] added folf identifier to macros --- folf/timeTools.hpp | 38 ++++++++++----------- tests/timeToolsTest.cpp | 76 ++++++++++++++++++++--------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/folf/timeTools.hpp b/folf/timeTools.hpp index 53639d0..710aa72 100644 --- a/folf/timeTools.hpp +++ b/folf/timeTools.hpp @@ -8,25 +8,25 @@ #pragma once // macro functions -#define daysToHours(days) days * (long long)24 -#define daysToMinutes(days) days * (long long)1440 -#define daysToSeconds(days) days * (long long)86400 -#define hoursToDays(hours) hours / (double)24 -#define hoursToMinutes(hours) hours * (long long)60 -#define hoursToSeconds(hours) hours * (long long)3600 -#define minutesToDays(minutes) minutes / (double)1440 -#define minutesToHours(minutes) minutes / (double)60 -#define minutesToSeconds(minutes) minutes * (long long)60 -#define minutesToMilliseconds(minutes) minutes * (long long)60000 -#define secondsToHours(seconds) seconds / (double)3600 -#define secondsToMinutes(seconds) seconds / (double)60 -#define secondsToMilliseconds(seconds) seconds * (long long)1000 -#define secondsToMicroseconds(seconds) seconds * (long long)1000000 -#define millisecondsToMinutes(milliseconds) milliseconds / (double)60000 -#define millisecondsToSeconds(milliseconds) milliseconds / (double)1000 -#define millisecondsToMicroseconds(milliseconds) milliseconds * (long long)1000 -#define microsecondsToSeconds(microseconds) microseconds / (double)1000000 -#define microsecondsToMilliseconds(microseconds) microseconds / (double)1000 +#define folf_daysToHours(days) days * (long long)24 +#define folf_daysToMinutes(days) days * (long long)1440 +#define folf_daysToSeconds(days) days * (long long)86400 +#define folf_hoursToDays(hours) hours / (double)24 +#define folf_hoursToMinutes(hours) hours * (long long)60 +#define folf_hoursToSeconds(hours) hours * (long long)3600 +#define folf_minutesToDays(minutes) minutes / (double)1440 +#define folf_minutesToHours(minutes) minutes / (double)60 +#define folf_minutesToSeconds(minutes) minutes * (long long)60 +#define folf_minutesToMilliseconds(minutes) minutes * (long long)60000 +#define folf_secondsToHours(seconds) seconds / (double)3600 +#define folf_secondsToMinutes(seconds) seconds / (double)60 +#define folf_secondsToMilliseconds(seconds) seconds * (long long)1000 +#define folf_secondsToMicroseconds(seconds) seconds * (long long)1000000 +#define folf_millisecondsToMinutes(milliseconds) milliseconds / (double)60000 +#define folf_millisecondsToSeconds(milliseconds) milliseconds / (double)1000 +#define folf_millisecondsToMicroseconds(milliseconds) milliseconds * (long long)1000 +#define folf_microsecondsToSeconds(microseconds) microseconds / (double)1000000 +#define folf_microsecondsToMilliseconds(microseconds) microseconds / (double)1000 // includes various functions for benchmarking and common tasks diff --git a/tests/timeToolsTest.cpp b/tests/timeToolsTest.cpp index f0cb457..54392a3 100644 --- a/tests/timeToolsTest.cpp +++ b/tests/timeToolsTest.cpp @@ -5,42 +5,42 @@ TEST(timeToolsTest, timeConversionTest) { - EXPECT_EQ(daysToHours(3248), 77952); - EXPECT_FLOAT_EQ(daysToHours(45.93), 1102.32); - EXPECT_EQ(daysToMinutes(3248), 4677120); - EXPECT_FLOAT_EQ(daysToMinutes(45.93), 66139.2); - EXPECT_EQ(daysToSeconds(3248), 280627200); - EXPECT_EQ(daysToSeconds(45.93), 3968352); - EXPECT_FLOAT_EQ(hoursToDays(3248), 135.33333); - EXPECT_FLOAT_EQ(hoursToDays(45.93), 1.91375); - EXPECT_EQ(hoursToMinutes(3248), 194880); - EXPECT_FLOAT_EQ(hoursToMinutes(45.93), 2755.8); - EXPECT_EQ(hoursToSeconds(3248), 11692800); - EXPECT_EQ(hoursToSeconds(45.93), 165348); - EXPECT_FLOAT_EQ(minutesToDays(3248), 2.2555556); - EXPECT_FLOAT_EQ(minutesToDays(45.93), 0.031895833); - EXPECT_FLOAT_EQ(minutesToHours(3248), 54.133333); - EXPECT_FLOAT_EQ(minutesToHours(45.93), 0.7655); - EXPECT_EQ(minutesToSeconds(3248), 194880); - EXPECT_FLOAT_EQ(minutesToSeconds(45.93), 2755.8); - EXPECT_EQ(minutesToMilliseconds(3248), 194880000); - EXPECT_EQ(minutesToMilliseconds(45.93), 2755800); - EXPECT_FLOAT_EQ(secondsToHours(3248), 0.90222222); - EXPECT_FLOAT_EQ(secondsToHours(45.93), 0.012758333); - EXPECT_FLOAT_EQ(secondsToMinutes(3248), 54.133333); - EXPECT_FLOAT_EQ(secondsToMinutes(45.93), 0.7655); - EXPECT_EQ(secondsToMilliseconds(3248), 3248000); - EXPECT_EQ(secondsToMilliseconds(45.93), 45930); - EXPECT_EQ(secondsToMicroseconds(324), 324000000); - EXPECT_EQ(secondsToMicroseconds(45.93), 45930000); - EXPECT_FLOAT_EQ(millisecondsToMinutes(3248), 0.054133333); - EXPECT_FLOAT_EQ(millisecondsToMinutes(45.93), 0.0007655); - EXPECT_FLOAT_EQ(millisecondsToSeconds(3248), 3.248); - EXPECT_FLOAT_EQ(millisecondsToSeconds(45.93), 0.04593); - EXPECT_EQ(millisecondsToMicroseconds(3248), 3248000); - EXPECT_EQ(millisecondsToMicroseconds(45.93), 45930); - EXPECT_FLOAT_EQ(microsecondsToSeconds(3248), 0.003248); - EXPECT_FLOAT_EQ(microsecondsToSeconds(145.93), 0.00014593); - EXPECT_FLOAT_EQ(microsecondsToMilliseconds(3248), 3.248); - EXPECT_FLOAT_EQ(microsecondsToMilliseconds(45.93), 0.04593); + EXPECT_EQ(folf_daysToHours(3248), 77952); + EXPECT_FLOAT_EQ(folf_daysToHours(45.93), 1102.32); + EXPECT_EQ(folf_daysToMinutes(3248), 4677120); + EXPECT_FLOAT_EQ(folf_daysToMinutes(45.93), 66139.2); + EXPECT_EQ(folf_daysToSeconds(3248), 280627200); + EXPECT_EQ(folf_daysToSeconds(45.93), 3968352); + EXPECT_FLOAT_EQ(folf_hoursToDays(3248), 135.33333); + EXPECT_FLOAT_EQ(folf_hoursToDays(45.93), 1.91375); + EXPECT_EQ(folf_hoursToMinutes(3248), 194880); + EXPECT_FLOAT_EQ(folf_hoursToMinutes(45.93), 2755.8); + EXPECT_EQ(folf_hoursToSeconds(3248), 11692800); + EXPECT_EQ(folf_hoursToSeconds(45.93), 165348); + EXPECT_FLOAT_EQ(folf_minutesToDays(3248), 2.2555556); + EXPECT_FLOAT_EQ(folf_minutesToDays(45.93), 0.031895833); + EXPECT_FLOAT_EQ(folf_minutesToHours(3248), 54.133333); + EXPECT_FLOAT_EQ(folf_minutesToHours(45.93), 0.7655); + EXPECT_EQ(folf_minutesToSeconds(3248), 194880); + EXPECT_FLOAT_EQ(folf_minutesToSeconds(45.93), 2755.8); + EXPECT_EQ(folf_minutesToMilliseconds(3248), 194880000); + EXPECT_EQ(folf_minutesToMilliseconds(45.93), 2755800); + EXPECT_FLOAT_EQ(folf_secondsToHours(3248), 0.90222222); + EXPECT_FLOAT_EQ(folf_secondsToHours(45.93), 0.012758333); + EXPECT_FLOAT_EQ(folf_secondsToMinutes(3248), 54.133333); + EXPECT_FLOAT_EQ(folf_secondsToMinutes(45.93), 0.7655); + EXPECT_EQ(folf_secondsToMilliseconds(3248), 3248000); + EXPECT_EQ(folf_secondsToMilliseconds(45.93), 45930); + EXPECT_EQ(folf_secondsToMicroseconds(324), 324000000); + EXPECT_EQ(folf_secondsToMicroseconds(45.93), 45930000); + EXPECT_FLOAT_EQ(folf_millisecondsToMinutes(3248), 0.054133333); + EXPECT_FLOAT_EQ(folf_millisecondsToMinutes(45.93), 0.0007655); + EXPECT_FLOAT_EQ(folf_millisecondsToSeconds(3248), 3.248); + EXPECT_FLOAT_EQ(folf_millisecondsToSeconds(45.93), 0.04593); + EXPECT_EQ(folf_millisecondsToMicroseconds(3248), 3248000); + EXPECT_EQ(folf_millisecondsToMicroseconds(45.93), 45930); + EXPECT_FLOAT_EQ(folf_microsecondsToSeconds(3248), 0.003248); + EXPECT_FLOAT_EQ(folf_microsecondsToSeconds(145.93), 0.00014593); + EXPECT_FLOAT_EQ(folf_microsecondsToMilliseconds(3248), 3.248); + EXPECT_FLOAT_EQ(folf_microsecondsToMilliseconds(45.93), 0.04593); } From b8c6720f6f5bd205d492bd0ad0c1f84116c262a8 Mon Sep 17 00:00:00 2001 From: damon Date: Fri, 15 Jan 2021 18:29:54 +0000 Subject: [PATCH 2/4] changed createVector to macro --- folf/calcTools.cpp | 4 ---- folf/calcTools.hpp | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/folf/calcTools.cpp b/folf/calcTools.cpp index b1b5234..c8192d1 100644 --- a/folf/calcTools.cpp +++ b/folf/calcTools.cpp @@ -49,7 +49,3 @@ bool folf::calcTools::isChance(int chanceDenominator) { return calcTools::randomNum(chanceDenominator) == 0; } -signed int folf::calcTools::createVector(const unsigned int *from, const unsigned int *to) -{ - return *to - *from; -} diff --git a/folf/calcTools.hpp b/folf/calcTools.hpp index 6ae7d26..6e18216 100644 --- a/folf/calcTools.hpp +++ b/folf/calcTools.hpp @@ -7,6 +7,10 @@ // ============================================================================================= #pragma once +// creates a vector of two numbers by deviding the second from the first +// createVector(X,Y) +#define folf_vectorCreate(from,to) to - from + // includes various functions for benchmarking and common tasks namespace folf { @@ -21,8 +25,5 @@ namespace folf bool isChance(int); // returns a random number up to x unsigned long long randomNum(int); - // creates a vector of two numbers by deviding the second from the first - // createVector(X,Y) - signed int createVector(const unsigned int*, const unsigned int*); } } From 58da3e053e2c33ebbb305e409067bee7f002f810 Mon Sep 17 00:00:00 2001 From: damon Date: Fri, 15 Jan 2021 18:30:15 +0000 Subject: [PATCH 3/4] moved to V1.0.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6cd8d4..1c85fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) project(folf-namespace - VERSION 1.0.1 + VERSION 1.0.2 DESCRIPTION "FOLF - A C++ library developed by a fox and a wolf for testing and making development easier!" HOMEPAGE_URL "https://github.com/FOLF-projects/folf-namespace" LANGUAGES CXX) From 62daa45d982ccb41f2cd71e7d7292c6c974e4cee Mon Sep 17 00:00:00 2001 From: damon Date: Fri, 15 Jan 2021 18:36:13 +0000 Subject: [PATCH 4/4] added missing identifier --- examples/time-operations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/time-operations.cpp b/examples/time-operations.cpp index 3b48fad..34685b5 100644 --- a/examples/time-operations.cpp +++ b/examples/time-operations.cpp @@ -11,7 +11,7 @@ int main() { const long double days = 9.97879; const double newDays = 9.97879; - std::cout << "num = " << daysToHours(days) << std::endl; + std::cout << "num = " << folf_daysToHours(days) << std::endl; std::cout << "NewNum = " << newDays * 24 << std::endl; return 0;