Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit32b02af

Browse files
committed
Merge branch 'Development' ofhttps://github.com/TheAlgorithms/Java into Development
1 parent60c77e5 commit32b02af

File tree

18 files changed

+50
-53
lines changed

18 files changed

+50
-53
lines changed

‎src/main/java/com/caching/LFUCache.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void deleteNode(Node node) {
7575
publicLFUCache(intcapacity) {
7676
this.capacity =capacity;
7777
size =0;
78-
freq =newTreeMap<>();
79-
map =newHashMap<>();
78+
freq =newTreeMap<Integer,DLL>();
79+
map =newHashMap<Integer,Node>();
8080
System.out.println("LFUCache initialised with capacity: " +capacity);
8181
}
8282

@@ -145,8 +145,8 @@ public void put(int key, T value) {
145145
dll.deleteNode(dll.tail.pre);
146146
if (dll.len ==0 &&lowest !=1)
147147
freq.remove(lowest);
148-
DLLfreqOne =freq.computeIfAbsent(1,k ->newDLL());
149-
freqOne.addToHead(node);
148+
DLLfreq_one =freq.computeIfAbsent(1,k ->newDLL());
149+
freq_one.addToHead(node);
150150
}
151151
}
152152

‎src/main/java/com/caching/LRUCache.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void put(int key, T value) {
6363
System.out.println("Cache set to 0 capacity. No elements will be cached");
6464
}
6565

66+
TcurrentValue =cache.get(key);
6667
if (!cache.containsKey(key)) {
6768
cache.put(key,value);
6869
System.out.println("Adding new key:" +key +" to cache");

‎src/main/java/com/ciphers/CaesarBruteForce.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ public class CaesarBruteForce {
55
/**
66
* Recursively Brute forces a parsed encrypted text, trying out all shifting keys from 1-26, printing out all decryption attempts
77
* @param message (String) The encrypted text.
8-
* @paramkey (int) The key used to decrypt the encrypted text and is increment upon a recursive call.
8+
* @paramKey (int) The key used to decrypt the encrypted text and is increment upon a recursive call.
99
* @return (String) Concatenated string of all decryption attempts (For unit testing purposes).
1010
*/
11-
publicStringdecrypt(Stringmessage,intkey) {
11+
publicStringdecrypt(Stringmessage,intKey) {
1212
finalStringLETTERS ="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
13-
if (key >26){System.out.println();returnnull; }
13+
if (Key >26){System.out.println();returnnull; }
1414

1515
StringBuilderplainText =newStringBuilder();
1616
for (charcharacter :message.toUpperCase().toCharArray()) {
1717
intindex =LETTERS.indexOf(character);
1818

1919
if (index != -1) {
20-
index -=key;
20+
index -=Key;
2121
//Wrap around index value range[1-26]
2222
if (index <0) {index +=LETTERS.length(); }
2323
plainText.append(LETTERS.toCharArray()[index]);
2424
}else {plainText.append(character); }
2525
}
26-
System.out.println(String.format("Current Decryption Key %d : %s",key,plainText));
27-
returnplainText.append(decrypt(message,key+1)).toString();
26+
System.out.println(String.format("Current Decryption Key %d : %s",Key,plainText));
27+
returnplainText.append(decrypt(message,Key+1)).toString();
2828
}
2929
}

‎src/main/java/com/conversions/HexadecimalToBinary.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class HexadecimalToBinary {
1212
publicStringhexToBin (StringhexStr) {
1313

1414
StringbinaryString ="",hexaNumbers ="0123456789ABCDEF",
15-
decimalStr ="",binaryStringBefore ="" ,binaryStringAfter ="";
15+
DecimalStr ="",binaryStringBefore ="" ,binaryStringAfter ="";
1616
intindexOfHex,decimalNumber =0,k =1,n =1,z=1,decimalNumberBefore =0
1717
,decimalNumberAfter =0;
1818
charletter;
@@ -48,12 +48,12 @@ public String hexToBin (String hexStr) {
4848

4949
StringdecimalNumberAfterStr =String.valueOf(decimalNumberAfter);
5050

51-
decimalStr =decimalNumberBeforeStr +'.' +decimalNumberAfterStr;
51+
DecimalStr =decimalNumberBeforeStr +'.' +decimalNumberAfterStr;
5252
}
5353

5454

5555

56-
intpointPositionDec =decimalStr.indexOf(".");
56+
intpointPositionDec =DecimalStr.indexOf(".");
5757
/**
5858
* Check whether the result contains a floating point or not
5959
*/

‎src/main/java/com/datastructures/BinaryTree.java‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33
/**
44
* Binary tree for general value type, without redundancy
@@ -8,7 +8,7 @@
88

99
publicclassBinaryTree<TextendsComparable> {
1010
privatefinalTdata;
11-
privateBinaryTree<T>right,// the upper binary tree
11+
privateBinaryTreeright,// the upper binary tree
1212
left;// the lower binary tree
1313

1414
publicBinaryTree(Tdata) {
@@ -21,38 +21,35 @@ public String toString() {
2121
}
2222

2323
/**
24-
* inserts a new value in it'scorrespondent place
24+
* inserts a new value in it'scorrespondant place
2525
*
2626
* @param newDataValue value of the new binary tree to add on this tree
2727
*/
2828
publicvoidinsert(TnewDataValue) {
29-
this.insert(newBinaryTree<>(newDataValue));
29+
this.insert(newBinaryTree(newDataValue));
3030
}
3131

3232
/**
33-
* inserts a new binary tree in it'scorrespondent place
33+
* inserts a new binary tree in it'scorrespondant place
3434
*
3535
* @param newData new value to add on this tree
3636
*/
37-
publicvoidinsert(BinaryTree<T>newData) {
37+
publicvoidinsert(BinaryTreenewData) {
3838

3939
intcpr =newData.data.compareTo(this.data);//new value comparission respect to actual value
4040

41-
if (cpr <0) {
42-
if (this.left ==null) {
41+
if (cpr <0)
42+
if (this.left ==null)
4343
this.setLeft(newData);
44-
}else {
44+
else
4545
this.left.insert(newData);
46-
}
47-
}elseif (cpr >0) {
48-
if (this.right ==null) {
46+
elseif (cpr >0)
47+
if (this.right ==null)
4948
this.setRight(newData);
50-
}else {
49+
else
5150
this.right.insert(newData);
52-
}
53-
}else {
51+
else
5452
System.out.println("Redundant value, not added");
55-
}
5653
}
5754

5855
/**
@@ -61,8 +58,8 @@ public void insert(BinaryTree<T> newData) {
6158
* @param data Searched value
6259
* @return Binary tree which contains the value, null if it doesn't exist
6360
*/
64-
publicBinaryTree<T>search(Tdata) {
65-
intcpr =data.compareTo(this.data);//new valuecomparison respect to actual value
61+
publicBinaryTreesearch(Tdata) {
62+
intcpr =data.compareTo(this.data);//new valuecomparission respect to actual value
6663

6764
if (cpr <0) {
6865
if (this.left ==null)
@@ -116,19 +113,19 @@ public T getData() {
116113
returndata;
117114
}
118115

119-
publicBinaryTree<T>getRight() {
116+
publicBinaryTreegetRight() {
120117
returnright;
121118
}
122119

123-
publicvoidsetRight(BinaryTree<T>right) {
120+
publicvoidsetRight(BinaryTreeright) {
124121
this.right =right;
125122
}
126123

127-
publicBinaryTree<T>getLeft() {
124+
publicBinaryTreegetLeft() {
128125
returnleft;
129126
}
130127

131-
publicvoidsetLeft(BinaryTree<T>left) {
128+
publicvoidsetLeft(BinaryTreeleft) {
132129
this.left =left;
133130
}
134131
}

‎src/main/java/com/datastructures/DisjointSet.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33
importjava.io.Serializable;
44
importjava.util.*;
@@ -18,15 +18,14 @@
1818
*/
1919
publicclassDisjointSet<T>implementsSerializable {
2020
privatestaticfinallongserialVersionUID =3134700471905625636L;
21-
privatestaticfinalStringelementKey ="element";
2221

23-
privatefinalMap<T,Node<T>>nodeMap =newHashMap<>();
22+
privateMap<T,Node<T>>nodeMap =newHashMap<>();
2423

2524
/**
2625
* Add an element to the disjoint-set forests as a set.
2726
*/
2827
publicvoidmakeSet(Telement) {
29-
checkNotNull(element,elementKey);
28+
checkNotNull(element,"element");
3029
nodeMap.putIfAbsent(element,newNode<>());
3130
}
3231

@@ -37,8 +36,8 @@ public void makeSet(T element) {
3736
* Rank is an upper bound on the height of node.
3837
*/
3938
publicvoidunion(Tleft,Tright) {
40-
checkNotNull(left,elementKey);
41-
checkNotNull(right,elementKey);
39+
checkNotNull(left,"element");
40+
checkNotNull(right,"element");
4241

4342
Node<T>leftNode =nodeMap.get(left),
4443
rightNode =nodeMap.get(right);

‎src/main/java/com/datastructures/GeneralQueue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33
importcom.types.Queue;
44

‎src/main/java/com/datastructures/IntQueue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33
/**
44
* This file contains an implementation of an integer only queue which is extremely quick and

‎src/main/java/com/datastructures/SinglyLinkedList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33

44

‎src/main/java/com/datastructures/Stack.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.datastructures;
1+
packagecom.dataStructures;
22

33
importjava.io.Serializable;
44
importjava.util.EmptyStackException;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp