Skip to content

Commit e880faf

Browse files
PtitbaptPtitbapt
committed
Merge branch 'Develop' into feature/tri_a_bulles_normal
2 parents d43a223 + 09da783 commit e880faf

11 files changed

Lines changed: 53 additions & 6 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.class
22
.idea
33
untitled104.iml
4+
.DS_Store

‎Tri-a-bulles-optimise/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="output" path="out/production/untitled104"/>
6+
</classpath>

‎Tri-a-bulles-optimise/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Tri-a-bulles_optimise</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

Tri-a-bulles_optimise/Algorithm.algo renamed to Tri-a-bulles-optimise/Algorithm.algo

File renamed without changes.

‎Tri-a-bulles-optimise/out/production/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/untitled104/

Tri-a-bulles_optimise/src/Main.java renamed to Tri-a-bulles-optimise/src/Main.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
// Import Arrays
2-
import org.jetbrains.annotations.NotNull;
3-
42
import java.util.Arrays;
53

64
public class Main {
75

86
public static void main(String[] args) {
97
// write your code here
108
// Clear console
11-
System.out.print("\033[H\033[2J");
9+
System.out.print("\033\033");
1210

1311
// Tableau de test
1412
int[] tableau = { 1, 3, 7, 2, 6, 4, 5, 8, 10, 9 };
@@ -17,7 +15,7 @@ public static void main(String[] args) {
1715

1816
}
1917

20-
public static int[] triBulle(int @NotNull [] tableau) {
18+
public static int[] triBulle(int [] tableau) {
2119
int n = tableau.length;
2220
boolean echange = true;
2321
while (echange) {

‎Tri-de-selection/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="output" path="bin"/>
6+
</classpath>

‎Tri-de-selection/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎Tri-de-selection/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Tri-de-selection</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

tri-selection/Algorithm.algo renamed to Tri-de-selection/Algorithm.algo

File renamed without changes.

0 commit comments

Comments
 (0)