- Code Improvement: change all comments for functions from using the word "arguments" to now using the right "parameters" word.

__New Features__
- 2 NEW COMMANDS: Converter and RandNum.
- When outputting a beep sound in the Beep and BeepSounds commands, you are now able to exit the output early by pressing the ESC key.
- A new feature called ToFile has been added! This feature allows you to stream all output of a command to a specific file. It is activated by supplying the '--tofile <file>' argument to a command. In the <file> area, embed the filepath of the file you wish to write to. This feature does not append the output to the file, but overwrites it instead. If the filepath has spaces, enclose it in quotations. During the command execution with this feature activated, no text is sent to the display (it all goes to the file). After the command is done, no more text is sent to the file, and the text goes straight back to the display.

__Changes and Bugfixes__
- Fixed a bug where in the CPUStress command, if the multi-core benchmark test was terminated, it would say that the single-core benchmark was terminated instead of the multi-core one.
- The following 6 commands: CPUStress, Stopwatch, Timer, Hacker and MemTest, are now no longer terminated by any keypress. Only the ESC keypress will terminate them.
- Tidied up code in general, resulting in small performance improvements.
- Improved word wrapping in the MemTest command.
- Improved random number generation performance.
- Improved efficiency and performance of the input parser in the command input screen.
- Improved reliability of the input parser in the command input screen.

Author: rforzachamp821

CommandFiles/CPUStress.cpp

@@ -17,9 +17,9 @@ void CpuStressTestWorker() {
 	long double ldStress = 1.0; 
 
 	while (!StopCpuStress) {
-		ldStress *= RandNum(0, 5);
-		ldStress /= RandNum(0.00000001, 5);
-		ldStress += RandNum(0, 5);
+		ldStress *= RandNumld(0, 5);
+		ldStress /= RandNumld(0.00000001, 5);
+		ldStress += RandNumld(0, 5);
 	}
 
 	return;
@@ -30,9 +30,9 @@ void CpuBenchmarkWorker() {
 	long double ldStress = 1.0;
 
 	while (!StopCpuStress) {
-		ldStress *= RandNum(0, 5);
-		ldStress /= RandNum(0.00000001, 5);
-		ldStress += RandNum(0, 5);
+		ldStress *= RandNumld(0, 5);
+		ldStress /= RandNumld(0.00000001, 5);
+		ldStress += RandNumld(0, 5);
 		nCurrentReiterationNum++;
 	}
 	return;
@@ -96,12 +96,15 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 		std::thread SingleCoreWorker(CpuBenchmarkWorker);
 
 		while (true) {
-
+			// Terminate on ESC keypress
 			if (_kbhit()) {
-				bCpuStressKeyboardTermination = true;
-				break;
+				if (_getch_nolock() == 27) {
+					bCpuStressKeyboardTermination = true;
+					break;
+				}
+				ClearKeyboardBuffer();
 			}
-			else if (nCurrentReiterationNum >= nReiterationCount) {
+			if (nCurrentReiterationNum >= nReiterationCount) {
 				break;
 			}
 
@@ -128,7 +131,7 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 		else {
 			colour(YLW, ConfigObjMain.sColourGlobalBack);
 			ClearKeyboardBuffer();
-			std::cout << wordWrap("\n\nThe single-core benchmark was terminated by a keyboard press.");
+			std::cout << wordWrap("\n\nThe single-core benchmark was terminated by an ESC keyboard press.");
 			Exiting();
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 		}
@@ -155,11 +158,15 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 
 		while (true) {
 
+			// Terminate on ESC keypress
 			if (_kbhit()) {
-				bCpuStressKeyboardTermination = true;
-				break;
+				if (_getch_nolock() == 27) {
+					bCpuStressKeyboardTermination = true;
+					break;
+				}
+				ClearKeyboardBuffer();
 			}
-			else if (nCurrentReiterationNum >= nReiterationCount) {
+			if (nCurrentReiterationNum >= nReiterationCount) {
 				break;
 			}
 
@@ -187,7 +194,7 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 		}
 		else {
 			colour(YLW, ConfigObjMain.sColourGlobalBack);
-			std::cout << wordWrap("\n\nThe single-core benchmark was terminated by a keyboard press.");
+			std::cout << wordWrap("\n\nThe multi-core benchmark was terminated by an ESC keyboard press.");
 			Exiting();
 			ClearKeyboardBuffer();
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
@@ -226,7 +233,7 @@ void CpuStressTest(short int nSingleOrMulti, bool bIsArgument = false) {
 			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 		}
 
-		std::cout << wordWrap("Remember, you can always stop the stress test by pressing any key while it's going.\nPress any key to begin the test, or ESC to terminate...");
+		std::cout << wordWrap("Remember, you can always stop the stress test by pressing the ESC key while it's going.\nPress any key to begin the test, or ESC to terminate...");
 		char cKeyCST = _getch();
 		if (cKeyCST == 27) {
 			colour(YLW, ConfigObjMain.sColourGlobalBack);
@@ -245,7 +252,7 @@ void CpuStressTest(short int nSingleOrMulti, bool bIsArgument = false) {
 		std::thread SingleCoreStressTest(CpuStressTestWorker);
 
 		// Then wait for keyboard hit to kill all the processes
-		while (!_kbhit()) {
+		while (!_kbhit() || _getch() != 27) {
 			sleep(10);
 		}
 
@@ -277,7 +284,7 @@ void CpuStressTest(short int nSingleOrMulti, bool bIsArgument = false) {
 			vThreads[i] = std::thread(CpuStressTestWorker);
 		}
 		// Then wait for keyboard hit to kill all the processes
-		while (!_kbhit()) {
+		while (!_kbhit() || _getch() != 27) {
 			sleep(10);
 		}
 

CommandFiles/CalculationAlgorithm/CalculationAlgorithm.h

@@ -50,33 +50,33 @@ class CalculationAlgorithm
 
 
 	// VerifyIfStringIsNumerical - Checks whether std::string argument is a true number or not
-	// Arguments: sNumberTest - The number string to check.
+	// Parameters: sNumberTest - The number string to check.
 	// Return Values: TRUE or 1 for number, FALSE or 0 for not a number.
 	//
 	bool VerifyIfStringIsNumerical(const std::string sNumberTest);
 
 	// FormatValueForDisplay - Formats a specific value for display output.
 	//                       - Has a max of 15-16dp.
-	// Arguments: dValue - The number to format.
+	// Parameters: dValue - The number to format.
 	// Return Value: Formatted number as a string.
 	//
 	std::string FormatValueForDisplay(long double dValue);
 
 	// FormatValueForAlgorithm - Formats a specific value for internal algorithm calculations.
 	//                         - Has a max of 18-19dp.
-	// Arguments: dValue - The number to format.
+	// Parameters: dValue - The number to format.
 	// Return Value: Formatted number as a string.
 	//
 	std::string FormatValueForAlgorithm(long double dValue);
 
 	// FormatStringForDisplay - Formats a calculation string for display output, by rounding the numbers inside and removing the zeroes from them.
-	// Arguments: sCalculationString - The string to format.
+	// Parameters: sCalculationString - The string to format.
 	// Return value: Formatted string.
 	//
 	std::string FormatStringForDisplay(std::string sCalculationString);
 
 	// FormatStringForAlgorithm - Formats a calculation string for algorithm use, including changing number formatting to the American notation.
-	// Arguments: sCalculationString - The string to format.
+	// Parameters: sCalculationString - The string to format.
 	// Return value: Formatted string.
 	//
 	std::string FormatStringForAlgorithm(std::string sCalculationString);
@@ -103,28 +103,28 @@ class CalculationAlgorithm
 	// Calculate - Main calculation algorithm that calculates using each of the 4 basic mathematical operators,
 	//             with negative number support along with that. The nErrorLevel variable is modified when 
 	//             anything goes wrong.
-	// Arguments: sCalculationString - The calculation string to work out the product of/find the answer of.
+	// Parameters: sCalculationString - The calculation string to work out the product of/find the answer of.
 	// Return values: The calculated answer in long double-grade precision.
 	//
 	long double Calculate(std::string sCalculationString);
 
 	// EradicateBrackets - Removes brackets from calculation string and converts them to constant numbers.
 	//                     It has support for numbers before and after the brackets that are attached to the brackets.
-	// Arguments: sCalculationString - The calculation string to remove and simplify the brackets from.
+	// Parameters: sCalculationString - The calculation string to remove and simplify the brackets from.
 	// Return values: Modified string
 	//
 	std::string EradicateBrackets(std::string sCalculationString);
 
 	// RemoveUnnecessaryArithmeticSymbols - Simplifies/removes arithmetic operators that are placed next to each other,
 	//                                 e.g) 5+-++--+-5 simplifies to 5+5
-	// Arguments: sCalculationString - The calculation string to remove the arithmetic symbols from.
+	// Parameters: sCalculationString - The calculation string to remove the arithmetic symbols from.
 	// Return values: Modified string
 	//
 	std::string RemoveUnnecessaryArithmeticSymbols(std::string sCalculationString);
 
 	// RemoveAllFormatting - Remove spaces/thousands separators from mathematical expression.
 	//                     - Required in case user uses spaces/thousands separators, as spaces/thousands separators will cause unintended syntax errors.
-	// Arguments: sCalculationString - The calculation string to remove space/thousands separator characters from.
+	// Parameters: sCalculationString - The calculation string to remove space/thousands separator characters from.
 	// Return values: Modified string
 	//
 	std::string RemoveAllFormatting(std::string sCalculationString);
@@ -141,7 +141,7 @@ class CalculationAlgorithm
 	~CalculationAlgorithm();
 
 	// GetLastCalculationErrorInfo - Gets the last calculation error and outputs details as a string.
-	// Arguments: None
+	// Parameters: None
 	// Return values: Error information string.
 	//
 	std::string GetLastCalculationErrorInfo();
@@ -151,7 +151,7 @@ class CalculationAlgorithm
 	//              1) A math error has occured (e.g division by 0).
 	//              2) A syntax error has occured.
 	//              3) An unknown number parsing error has occured.
-	// Arguments: None
+	// Parameters: None
 	// Return values: Last calculation error value.
 	//
 	inline short int GetLastCalculationErrorValue() 
@@ -162,7 +162,7 @@ class CalculationAlgorithm
 	// SafeCalculate - Calculates and finds the product of a calculation string provided by the user,
 	//                 which utilises all features contained in the calculation algorithm to prepare
 	//                 the calculation string for the calculation.
-	// Arguments: sCalculationString - The string to find the product of/calculate.
+	// Parameters: sCalculationString - The string to find the product of/calculate.
 	// Return values: The calculated answer in long double-grade precision.
 	// 
 	// NOTE: This function returns 0.0 if any errors occur, and sets the error level accordingly.