From 2676bb112efbc5da99f9a1176f01d7d56df54014 Mon Sep 17 00:00:00 2001 From: Brandon Johnson Date: Sun, 24 Jul 2022 00:55:07 -0600 Subject: [PATCH] add tests/Strings, change String to Strings, code style updates --- DIRECTORY.md | 102 +++++++++--------- String/CountSentences.php | 23 ---- String/CountVowelsConsonantNumber.php | 49 --------- String/ReverseWords.php | 12 --- {String => Strings}/CheckAnagram.php | 16 ++- {String => Strings}/CheckPalindrome.php | 21 +++- .../CheckPalindrome2.php | 19 ++-- Strings/CountConsonants.php | 31 ++++++ Strings/CountSentences.php | 15 +++ {String => Strings}/CountVowels.php | 38 +++---- .../EditDistance.php => Strings/Distance.php | 11 +- {String => Strings}/MaxCharacter.php | 6 +- {String => Strings}/ReverseString.php | 8 +- Strings/ReverseWords.php | 22 ++++ tests/StringTest.php | 78 -------------- tests/Strings/StringsTest.php | 102 ++++++++++++++++++ 16 files changed, 297 insertions(+), 256 deletions(-) delete mode 100644 String/CountSentences.php delete mode 100644 String/CountVowelsConsonantNumber.php delete mode 100644 String/ReverseWords.php rename {String => Strings}/CheckAnagram.php (54%) rename {String => Strings}/CheckPalindrome.php (56%) rename String/CheckPalindromeString.php => Strings/CheckPalindrome2.php (76%) create mode 100644 Strings/CountConsonants.php create mode 100644 Strings/CountSentences.php rename {String => Strings}/CountVowels.php (55%) rename String/EditDistance.php => Strings/Distance.php (94%) rename {String => Strings}/MaxCharacter.php (91%) rename {String => Strings}/ReverseString.php (67%) create mode 100644 Strings/ReverseWords.php delete mode 100644 tests/StringTest.php create mode 100644 tests/Strings/StringsTest.php diff --git a/DIRECTORY.md b/DIRECTORY.md index ca65407..7e3c623 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -1,10 +1,10 @@ # List of all files ## Ciphers - * [Caesarcipher](./ciphers/caesarCipher.php) - * [Monoalphabeticcipher](./ciphers/monoAlphabeticCipher.php) - * [Morsecode](./ciphers/morseCode.php) - * [Xorcipher](./ciphers/XORCipher.php) + * [Caesarcipher](./Ciphers/CaesarCipher.php) + * [Monoalphabeticcipher](./Ciphers/monoAlphabeticCipher.php) + * [Morsecode](./Ciphers/MorseCode.php) + * [Xorcipher](./Ciphers/XORCipher.php) ## Conversions * [Binarytodecimal](./Conversions/BinaryToDecimal.php) @@ -21,58 +21,64 @@ * [Fibonacci](./Maths/Fibonacci.php) * [Fibonacci2](./Maths/Fibonacci2.php) * [Perfectsquare](./Maths/PerfectSquare.php) - -## Projecteuler - * [Problem1](./ProjectEuler/Problem1.php) - * [Problem2](./ProjectEuler/Problem2.php) - * [Problem3](./ProjectEuler/Problem3.php) - * [Problem5](./ProjectEuler/Problem5.php) - * [Problem6](./ProjectEuler/Problem6.php) - * [Problem7](./ProjectEuler/Problem7.php) - * [Problem9](./ProjectEuler/Problem9.php) + * Projecteuler + * [Problem1](./Maths/ProjectEuler/Problem1.php) + * [Problem2](./Maths/ProjectEuler/Problem2.php) + * [Problem3](./Maths/ProjectEuler/Problem3.php) + * [Problem5](./Maths/ProjectEuler/Problem5.php) + * [Problem6](./Maths/ProjectEuler/Problem6.php) + * [Problem7](./Maths/ProjectEuler/Problem7.php) + * [Problem9](./Maths/ProjectEuler/Problem9.php) ## Searches - * [Binary Search](./searches/binary_search.php) + * [Binarysearch](./searches/BinarySearch.php) * [Fibonaccisearch](./searches/fibonacciSearch.php) - * [Linear Search](./searches/linear_search.php) - * [Lower Bound](./searches/lower_bound.php) - * [Upper Bound](./searches/upper_bound.php) + * [Linearsearch](./searches/LinearSearch.php) + * [Lowerbound](./searches/LowerBound.php) + * [Upperbound](./searches/UpperBound.php) ## Sorting * [Arraykeyssort](./sorting/arrayKeysSort.php) - * [Bubblesort](./sorting/bubbleSort.php) - * [Bubblesort2](./sorting/bubbleSort2.php) - * [Countsort](./sorting/countSort.php) - * [Insertionsort](./sorting/insertionSort.php) - * [Mergesort](./sorting/mergeSort.php) - * [Quicksort](./sorting/quickSort.php) - * [Radixsort](./sorting/radixSort.php) - * [Selectionsort](./sorting/selectionSort.php) + * [Bubblesort](./Sorting/BubbleSort.php) + * [Bubblesort2](./Sorting/BubbleSort2.php) + * [Countsort](./Sorting/CountSort.php) + * [Insertionsort](./Sorting/InsertionSort.php) + * [Mergesort](./Sorting/MergeSort.php) + * [Quicksort](./Sorting/QuickSort.php) + * [Radixsort](./Sorting/RadixSort.php) + * [Selectionsort](./Sorting/SelectionSort.php) -## String - * [Checkanagram](./String/CheckAnagram.php) - * [Checkpalindrome](./String/CheckPalindrome.php) - * [Checkpalindromestring](./String/CheckPalindromeString.php) - * [Countsentences](./String/CountSentences.php) - * [Countvowels](./String/CountVowels.php) - * [Countvowelsconsonantnumber](./String/CountVowelsConsonantNumber.php) - * [Editdistance](./String/EditDistance.php) - * [Maxcharacter](./String/MaxCharacter.php) - * [Reversestring](./String/ReverseString.php) - * [Reversewords](./String/ReverseWords.php) +## Strings + * [Checkanagram](./Strings/CheckAnagram.php) + * [Checkpalindrome](./Strings/CheckPalindrome.php) + * [Checkpalindrome2](./Strings/CheckPalindrome2.php) + * [Countconsonants](./Strings/CountConsonants.php) + * [Countsentences](./Strings/CountSentences.php) + * [Countvowels](./Strings/CountVowels.php) + * [Distance](./Strings/Distance.php) + * [Maxcharacter](./Strings/MaxCharacter.php) + * [Reversestring](./Strings/ReverseString.php) + * [Reversewords](./Strings/ReverseWords.php) ## Tests - * [Cipherstest](./tests/CiphersTest.php) - * [Ciphertest](./tests/CipherTest.php) - * [Conversionstest](./tests/ConversionsTest.php) - * [Decimaltobinarytest](./tests/DecimalToBinaryTest.php) - * [Fibonaccisearchtest](./tests/fibonacciSearchTest.php) - * [Mathtest](./tests/MathTest.php) - * [Monoalphabeticciphertest](./tests/MonoAlphabeticCipherTest.php) - * [Morsecodetest](./tests/MorseCodeTest.php) - * [Projecteulertest](./tests/ProjectEulerTest.php) + * Ciphers + * [Cipherstest](./tests/Ciphers/CiphersTest.php) + * [Monoalphabeticciphertest](./tests/Ciphers/MonoAlphabeticCipherTest.php) + * [Morsecodetest](./tests/Ciphers/MorseCodeTest.php) + * Conversions + * [Conversionstest](./tests/Conversions/ConversionsTest.php) + * Maths + * [Mathstest](./tests/Maths/MathsTest.php) + * [Projecteulertest](./tests/Maths/ProjectEulerTest.php) + * Searches + * [Binarysearchtest](./tests/Searches/BinarySearchTest.php) + * [Searchestest](./tests/Searches/SearchesTest.php) * Sorting * [Arraykeyssorttest](./tests/sorting/arrayKeysSortTest.php) - * [Countsorttest](./tests/sorting/countSortTest.php) - * [Quicksorttest](./tests/sorting/quickSortTest.php) - * [Stringtest](./tests/StringTest.php) + * [Sortingtests](./tests/Sorting/SortingTests.php) + * Strings + * [Stringstest](./tests/Strings/StringsTest.php) + +## Utils + * [Arrayhelpers](./Utils/ArrayHelpers.php) + * [Executiontime](./Utils/ExecutionTime.php) diff --git a/String/CountSentences.php b/String/CountSentences.php deleted file mode 100644 index 84f1028..0000000 --- a/String/CountSentences.php +++ /dev/null @@ -1,23 +0,0 @@ -= 'a' && $string[$i] <= 'z') { - - $consonantCount++; - } elseif ($string[$i] >= 0 && $string[$i] <= 9 && is_numeric($string[$i])) { - - $numberCount++; - } - } - - return 'total vowels - ' . $vowelCount . PHP_EOL . - 'total consonant - ' . $consonantCount . PHP_EOL . - 'total numeric number -' . $numberCount . PHP_EOL; -} - -// example -echo countVowelsConsonant('Hello World. 12345'); -echo countVowelsConsonant('Count Vowels, Consonant and numeric number. 09876'); diff --git a/String/ReverseWords.php b/String/ReverseWords.php deleted file mode 100644 index 4cbe0b4..0000000 --- a/String/ReverseWords.php +++ /dev/null @@ -1,12 +0,0 @@ -= 0; $i--) { - $reversedWords[] = $words[$i]; - } - return implode(' ', $reversedWords); -} diff --git a/String/CheckAnagram.php b/Strings/CheckAnagram.php similarity index 54% rename from String/CheckAnagram.php rename to Strings/CheckAnagram.php index 021af9e..d36a17d 100644 --- a/String/CheckAnagram.php +++ b/Strings/CheckAnagram.php @@ -1,15 +1,23 @@ = 'a' && $string[$i] <= 'z') + { + $consonantCount++; + } + } + + return $consonantCount; +} diff --git a/Strings/CountSentences.php b/Strings/CountSentences.php new file mode 100644 index 0000000..bf0d28f --- /dev/null +++ b/Strings/CountSentences.php @@ -0,0 +1,15 @@ += 0; $i--) + { + $reversedWords[] = $words[$i]; + } + + return implode(' ', $reversedWords); +} diff --git a/tests/StringTest.php b/tests/StringTest.php deleted file mode 100644 index bf9725c..0000000 --- a/tests/StringTest.php +++ /dev/null @@ -1,78 +0,0 @@ -