Skip to content

Commit 1b4a795

Browse files
lor6lor6
committed
fix conflicts
2 parents cf48fe4 + b021130 commit 1b4a795

41 files changed

Lines changed: 547 additions & 15 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎algorithms-miscellaneous-1/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@
1414
- [Calculate Factorial in Java](https://www.baeldung.com/java-calculate-factorial)
1515
- [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
1616
- [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
17-
- [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
1817
- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
19-
- [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
2018
- [Generate Combinations in Java](https://www.baeldung.com/java-combinations-algorithm)

‎algorithms-miscellaneous-2/README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
- [Create a Sudoku Solver in Java](http://www.baeldung.com/java-sudoku)
99
- [Displaying Money Amounts in Words](http://www.baeldung.com/java-money-into-words)
1010
- [A Collaborative Filtering Recommendation System in Java](http://www.baeldung.com/java-collaborative-filtering-recommendations)
11-
- [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
12-
- [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
13-
- [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)
1411
- [Check If Two Rectangles Overlap In Java](https://www.baeldung.com/java-check-if-two-rectangles-overlap)
1512
- [Calculate the Distance Between Two Points in Java](https://www.baeldung.com/java-distance-between-two-points)
1613
- [Find the Intersection of Two Lines in Java](https://www.baeldung.com/java-intersection-of-two-lines)

‎algorithms-miscellaneous-3/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/target/
2+
.settings/
3+
.classpath
4+
.project

‎algorithms-miscellaneous-3/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Relevant articles:
2+
3+
- [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
4+
- [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
5+
- [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
6+
- [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
7+
- [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)

‎algorithms-miscellaneous-3/pom.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>algorithms-miscellaneous-3</artifactId>
5+
<version>0.0.1-SNAPSHOT</version>
6+
<name>algorithms-miscellaneous-3</name>
7+
8+
<parent>
9+
<groupId>com.baeldung</groupId>
10+
<artifactId>parent-modules</artifactId>
11+
<version>1.0.0-SNAPSHOT</version>
12+
</parent>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.assertj</groupId>
17+
<artifactId>assertj-core</artifactId>
18+
<version>${org.assertj.core.version}</version>
19+
<scope>test</scope>
20+
</dependency>
21+
</dependencies>
22+
23+
<build>
24+
<pluginManagement>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.codehaus.mojo</groupId>
28+
<artifactId>exec-maven-plugin</artifactId>
29+
<version>${exec-maven-plugin.version}</version>
30+
</plugin>
31+
</plugins>
32+
</pluginManagement>
33+
</build>
34+
35+
<properties>
36+
<org.assertj.core.version>3.9.0</org.assertj.core.version>
37+
</properties>
38+
39+
</project>

algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java renamed to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/enumstatemachine/LeaveRequestState.java

File renamed without changes.

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java renamed to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanArabicConverter.java

File renamed without changes.

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java renamed to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/romannumerals/RomanNumeral.java

File renamed without changes.

algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java renamed to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/LinkedListFindMiddle.java

File renamed without changes.

algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java renamed to algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/twopointertechnique/MyNode.java

File renamed without changes.

0 commit comments

Comments
 (0)