Skip to content

Commit 845195d

Browse files
committed
refactor(Base): Using for methods name in Base.
1 parent 769d76a commit 845195d

8 files changed

Lines changed: 146 additions & 146 deletions

File tree

include/imeth/base/base.hpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@ namespace imeth {
55
class Base {
66
public:
77
// Convert FROM decimal TO any base (2-36)
8-
static std::string decimalToBinary(int decimal);
9-
static std::string decimalToTrinary(int decimal);
10-
static std::string decimalToOctal(int decimal);
11-
static std::string decimalToHexadecimal(int decimal);
12-
static std::string decimalToBase(int decimal, int base);
8+
static std::string decimal_to_binary(int decimal);
9+
static std::string decimal_to_trinary(int decimal);
10+
static std::string decimal_to_octal(int decimal);
11+
static std::string decimal_to_hexadecimal(int decimal);
12+
static std::string decimal_to_base(int decimal, int base);
1313

1414
// Convert FROM any base TO decimal
15-
static int binaryToDecimal(const std::string& binary);
16-
static int trinaryToDecimal(const std::string& trinary);
17-
static int octalToDecimal(const std::string& octal);
18-
static int hexadecimalToDecimal(const std::string& hex);
19-
static int baseToDecimal(const std::string& number, int base);
15+
static int binary_to_decimal(const std::string& binary);
16+
static int trinary_to_decimal(const std::string& trinary);
17+
static int octal_to_decimal(const std::string& octal);
18+
static int hexadecimal_to_decimal(const std::string& hex);
19+
static int base_to_decimal(const std::string& number, int base);
2020

2121
// Direct conversion between bases (goes through decimal)
2222
static std::string convert(const std::string& number, int fromBase, int toBase);
2323

2424
// Arithmetic operations in different bases
25-
static std::string addInBase(const std::string& num1, const std::string& num2, int base);
26-
static std::string subtractInBase(const std::string& num1, const std::string& num2, int base);
27-
static std::string multiplyInBase(const std::string& num1, const std::string& num2, int base);
25+
static std::string add_in_base(const std::string& num1, const std::string& num2, int base);
26+
static std::string subtract_in_base(const std::string& num1, const std::string& num2, int base);
27+
static std::string multiply_in_base(const std::string& num1, const std::string& num2, int base);
2828

2929
// Utility functions
30-
static bool isValidInBase(const std::string& number, int base);
31-
static std::string toUpperCase(const std::string& str);
30+
static bool is_valid_in_base(const std::string& number, int base);
31+
static std::string to_upper_case(const std::string& str);
3232

3333
private:
3434
static const std::string DIGITS;
35-
static char digitToChar(int digit);
36-
static int charToDigit(char c);
35+
static char digit_to_char(int digit);
36+
static int char_to_digit(char c);
3737
};
3838
} // namespace imeth

include/imeth/base/binary.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
namespace imeth {
55
namespace Binary {
66
// Conversion
7-
std::string fromDecimal(int decimal);
8-
int toDecimal(const std::string& binary);
7+
std::string from_decimal(int decimal);
8+
int to_decimal(const std::string& binary);
99

1010
// Arithmetic operations
1111
std::string add(const std::string& a, const std::string& b);
1212
std::string subtract(const std::string& a, const std::string& b);
1313
std::string multiply(const std::string& a, const std::string& b);
1414

1515
// Bitwise operations
16-
std::string bitwiseAND(const std::string& a, const std::string& b);
17-
std::string bitwiseOR(const std::string& a, const std::string& b);
18-
std::string bitwiseXOR(const std::string& a, const std::string& b);
19-
std::string bitwiseNOT(const std::string& binary);
20-
std::string leftShift(const std::string& binary, int positions);
21-
std::string rightShift(const std::string& binary, int positions);
16+
std::string bitwise_AND(const std::string& a, const std::string& b);
17+
std::string bitwise_OR(const std::string& a, const std::string& b);
18+
std::string bitwise_XOR(const std::string& a, const std::string& b);
19+
std::string bitwise_NOT(const std::string& binary);
20+
std::string left_shift(const std::string& binary, int positions);
21+
std::string right_shift(const std::string& binary, int positions);
2222

2323
// Utility
24-
bool isValid(const std::string& binary);
25-
std::string padLeft(const std::string& binary, size_t length);
26-
int countOnes(const std::string& binary);
27-
int countZeros(const std::string& binary);
24+
bool is_valid(const std::string& binary);
25+
std::string pad_left(const std::string& binary, size_t length);
26+
int count_ones(const std::string& binary);
27+
int count_zeros(const std::string& binary);
2828
}; // namespace binary
2929
} // namespace imeth

include/imeth/base/hexadecimal.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ namespace imeth {
55
class Hexadecimal {
66
public:
77
// Conversion
8-
static std::string fromDecimal(int decimal);
9-
static int toDecimal(const std::string& hex);
8+
static std::string from_decimal(int decimal);
9+
static int to_decimal(const std::string& hex);
1010

1111
// Arithmetic operations
1212
static std::string add(const std::string& a, const std::string& b);
1313
static std::string subtract(const std::string& a, const std::string& b);
1414
static std::string multiply(const std::string& a, const std::string& b);
1515

1616
// Utility
17-
static bool isValid(const std::string& hex);
18-
static std::string toUpperCase(const std::string& hex);
19-
static std::string toLowerCase(const std::string& hex);
20-
static std::string padLeft(const std::string& hex, size_t length);
17+
static bool is_valid(const std::string& hex);
18+
static std::string to_upper_case(const std::string& hex);
19+
static std::string to_lower_case(const std::string& hex);
20+
static std::string pad_left(const std::string& hex, size_t length);
2121

2222
private:
23-
static int charToDigit(char c);
24-
static char digitToChar(int digit);
23+
static int char_to_digit(char c);
24+
static char digit_to_char(int digit);
2525
};
2626
} // namespace imeth

include/imeth/base/octal.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
namespace imeth {
55
namespace Octal {
66
// Conversion
7-
static std::string fromDecimal(int decimal);
8-
static int toDecimal(const std::string& octal);
7+
static std::string from_decimal(int decimal);
8+
static int to_decimal(const std::string& octal);
99

1010
// Arithmetic operations
1111
static std::string add(const std::string& a, const std::string& b);
1212
static std::string subtract(const std::string& a, const std::string& b);
1313
static std::string multiply(const std::string& a, const std::string& b);
1414

1515
// Utility
16-
static bool isValid(const std::string& octal);
17-
static std::string padLeft(const std::string& octal, size_t length);
16+
static bool is_valid(const std::string& octal);
17+
static std::string pad_left(const std::string& octal, size_t length);
1818
}; // namespace octal
1919
} // namespace imeth

src/base/base.cpp

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ namespace imeth {
88

99
const std::string Base::DIGITS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
1010

11-
char Base::digitToChar(int digit) {
11+
char Base::digit_to_char(int digit) {
1212
if (digit < 0 || digit >= 36) {
1313
throw std::invalid_argument("Digit out of range");
1414
}
1515
return DIGITS[digit];
1616
}
1717

18-
int Base::charToDigit(char c) {
18+
int Base::char_to_digit(char c) {
1919
c = std::toupper(c);
2020
if (c >= '0' && c <= '9') {
2121
return c - '0';
@@ -27,7 +27,7 @@ int Base::charToDigit(char c) {
2727
}
2828

2929
// Convert decimal to any base
30-
std::string Base::decimalToBase(int decimal, const int base) {
30+
std::string Base::decimal_to_base(int decimal, const int base) {
3131
if (base < 2 || base > 36) {
3232
throw std::invalid_argument("Base must be between 2 and 36");
3333
}
@@ -40,32 +40,32 @@ std::string Base::decimalToBase(int decimal, const int base) {
4040
std::string result = "";
4141
while (decimal > 0) {
4242
int remainder = decimal % base;
43-
result = digitToChar(remainder) + result;
43+
result = digit_to_char(remainder) + result;
4444
decimal /= base;
4545
}
4646

4747
if (negative) result = "-" + result;
4848
return result;
4949
}
5050

51-
std::string Base::decimalToBinary(const int decimal) {
52-
return decimalToBase(decimal, 2);
51+
std::string Base::decimal_to_binary(const int decimal) {
52+
return decimal_to_base(decimal, 2);
5353
}
5454

55-
std::string Base::decimalToTrinary(const int decimal) {
56-
return decimalToBase(decimal, 3);
55+
std::string Base::decimal_to_trinary(const int decimal) {
56+
return decimal_to_base(decimal, 3);
5757
}
5858

59-
std::string Base::decimalToOctal(const int decimal) {
60-
return decimalToBase(decimal, 8);
59+
std::string Base::decimal_to_octal(const int decimal) {
60+
return decimal_to_base(decimal, 8);
6161
}
6262

63-
std::string Base::decimalToHexadecimal(const int decimal) {
64-
return decimalToBase(decimal, 16);
63+
std::string Base::decimal_to_hexadecimal(const int decimal) {
64+
return decimal_to_base(decimal, 16);
6565
}
6666

6767
// Convert from any base to decimal
68-
int Base::baseToDecimal(const std::string& number, int base) {
68+
int Base::base_to_decimal(const std::string& number, int base) {
6969
if (base < 2 || base > 36) {
7070
throw std::invalid_argument("Base must be between 2 and 36");
7171
}
@@ -82,7 +82,7 @@ int Base::baseToDecimal(const std::string& number, int base) {
8282

8383
// Process from right to left
8484
for (int i = number.length() - 1; i >= static_cast<int>(start); --i) {
85-
int digit = charToDigit(number[i]);
85+
int digit = char_to_digit(number[i]);
8686
if (digit >= base) {
8787
throw std::invalid_argument("Invalid digit for base");
8888
}
@@ -93,49 +93,49 @@ int Base::baseToDecimal(const std::string& number, int base) {
9393
return negative ? -result : result;
9494
}
9595

96-
int Base::binaryToDecimal(const std::string& binary) {
97-
return baseToDecimal(binary, 2);
96+
int Base::binary_to_decimal(const std::string& binary) {
97+
return base_to_decimal(binary, 2);
9898
}
9999

100-
int Base::trinaryToDecimal(const std::string& trinary) {
101-
return baseToDecimal(trinary, 3);
100+
int Base::trinary_to_decimal(const std::string& trinary) {
101+
return base_to_decimal(trinary, 3);
102102
}
103103

104-
int Base::octalToDecimal(const std::string& octal) {
105-
return baseToDecimal(octal, 8);
104+
int Base::octal_to_decimal(const std::string& octal) {
105+
return base_to_decimal(octal, 8);
106106
}
107107

108-
int Base::hexadecimalToDecimal(const std::string& hex) {
109-
return baseToDecimal(hex, 16);
108+
int Base::hexadecimal_to_decimal(const std::string& hex) {
109+
return base_to_decimal(hex, 16);
110110
}
111111

112112
// Direct conversion between bases
113113
std::string Base::convert(const std::string& number, const int fromBase, const int toBase) {
114-
const int decimal = baseToDecimal(number, fromBase);
115-
return decimalToBase(decimal, toBase);
114+
const int decimal = base_to_decimal(number, fromBase);
115+
return decimal_to_base(decimal, toBase);
116116
}
117117

118118
// Arithmetic operations in different bases
119-
std::string Base::addInBase(const std::string& num1, const std::string& num2, const int base) {
120-
const int dec1 = baseToDecimal(num1, base);
121-
const int dec2 = baseToDecimal(num2, base);
122-
return decimalToBase(dec1 + dec2, base);
119+
std::string Base::add_in_base(const std::string& num1, const std::string& num2, const int base) {
120+
const int dec1 = base_to_decimal(num1, base);
121+
const int dec2 = base_to_decimal(num2, base);
122+
return decimal_to_base(dec1 + dec2, base);
123123
}
124124

125-
std::string Base::subtractInBase(const std::string& num1, const std::string& num2, const int base) {
126-
const int dec1 = baseToDecimal(num1, base);
127-
const int dec2 = baseToDecimal(num2, base);
128-
return decimalToBase(dec1 - dec2, base);
125+
std::string Base::subtract_in_base(const std::string& num1, const std::string& num2, const int base) {
126+
const int dec1 = base_to_decimal(num1, base);
127+
const int dec2 = base_to_decimal(num2, base);
128+
return decimal_to_base(dec1 - dec2, base);
129129
}
130130

131-
std::string Base::multiplyInBase(const std::string& num1, const std::string& num2, const int base) {
132-
const int dec1 = baseToDecimal(num1, base);
133-
const int dec2 = baseToDecimal(num2, base);
134-
return decimalToBase(dec1 * dec2, base);
131+
std::string Base::multiply_in_base(const std::string& num1, const std::string& num2, const int base) {
132+
const int dec1 = base_to_decimal(num1, base);
133+
const int dec2 = base_to_decimal(num2, base);
134+
return decimal_to_base(dec1 * dec2, base);
135135
}
136136

137137
// Utility functions
138-
bool Base::isValidInBase(const std::string& number, const int base) {
138+
bool Base::is_valid_in_base(const std::string& number, const int base) {
139139
if (number.empty() || base < 2 || base > 36) {
140140
return false;
141141
}
@@ -144,7 +144,7 @@ bool Base::isValidInBase(const std::string& number, const int base) {
144144

145145
for (size_t i = start; i < number.length(); ++i) {
146146
try {
147-
int digit = charToDigit(number[i]);
147+
int digit = char_to_digit(number[i]);
148148
if (digit >= base) {
149149
return false;
150150
}
@@ -156,7 +156,7 @@ bool Base::isValidInBase(const std::string& number, const int base) {
156156
return true;
157157
}
158158

159-
std::string Base::toUpperCase(const std::string& str) {
159+
std::string Base::to_upper_case(const std::string& str) {
160160
std::string result = str;
161161
std::ranges::transform(result, result.begin(), ::toupper);
162162
return result;

0 commit comments

Comments
 (0)