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

Commit 10f9d91

Browse files
author
javiluli
committed
Agrego la nueva funcion Multicolor en los graficos/barras
1 parent c8c334b commit 10f9d91

File tree

18 files changed

+204
-52
lines changed

18 files changed

+204
-52
lines changed

‎data/media/img/fondo_multicolor.jpg

781 Bytes
Loading[フレーム]

‎src/Sorts/Algoritmos/Bubble.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@ public Bubble(Main m) {
1616
public void sort() {
1717
setInicio(System.currentTimeMillis());
1818
for (int i = 0; i < n.length; i++) {
19-
for (int j = 0; j < n.length - 1 - i; j++) {
19+
for (int j = 0; j < n.length - 1; j++) {
2020
if (n[j] > n[j + 1]) {
2121
int temp = n[j];
2222
n[j] = n[j + 1];
2323
n[j + 1] = temp;
2424
cambiosArray++;
2525
}
26-
// Barras.mismo = j+1;
26+
// Barras.mismo = j + 1;
2727
accesoArray += 2;
2828
m.updateAnimaciones();
2929
}
3030
m.textos();
3131
}
32+
Barras.finSort = true;
3233
}
3334

3435
@Override
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package Sorts.Algoritmos;
2+
3+
import Interfaz.Sort;
4+
import Principal.Barras;
5+
import Principal.Main;
6+
import Sorts.Sorts;
7+
8+
public class BubbleOptimized extends Sorts implements Sort {
9+
10+
public BubbleOptimized(Main m) {
11+
this.m = m;
12+
sort();
13+
}
14+
15+
// @Override
16+
public void sort() {
17+
setInicio(System.currentTimeMillis());
18+
boolean needNextPass = true;
19+
for (int i = 1; i < n.length && needNextPass; i++) {
20+
needNextPass = false;
21+
for (int j = 0; j < n.length - i; j++) {
22+
if (n[j] > n[j + 1]) {
23+
int temp = n[j];
24+
n[j] = n[j + 1];
25+
n[j + 1] = temp;
26+
cambiosArray++;
27+
needNextPass = true;
28+
}
29+
accesoArray += 2;
30+
m.updateAnimaciones();
31+
}
32+
m.textos();
33+
}
34+
Barras.finSort = true;
35+
}
36+
37+
@Override
38+
public String getNombre() {
39+
return "Bubble Sort";
40+
}
41+
}

‎src/Sorts/Algoritmos/Cocktail.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -51,6 +52,7 @@ public void sort() {
5152
}
5253
inicio = inicio + 1;
5354
}
55+
Barras.finSort = true;
5456
}
5557

5658
@Override

‎src/Sorts/Algoritmos/Cycle.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package Sorts.Algoritmos;
22

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
4+
import Principal.Barras;
55
import Principal.Main;
66
import Sorts.Sorts;
77

@@ -58,6 +58,7 @@ public void sort() {
5858
m.updateAnimaciones();
5959
}
6060
}
61+
Barras.finSort = true;
6162
}
6263

6364
// @Override

‎src/Sorts/Algoritmos/Gnome.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -30,6 +31,7 @@ public void sort() {
3031
}
3132
m.updateAnimaciones();
3233
}
34+
Barras.finSort = true;
3335
}
3436

3537
@Override

‎src/Sorts/Algoritmos/Heap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -29,6 +30,7 @@ public void sort() {
2930
m.updateAnimaciones();
3031
heapify(n, i, 0);
3132
}
33+
Barras.finSort = true;
3234
}
3335

3436
void heapify(int arr[], int n, int i) {

‎src/Sorts/Algoritmos/Inserccion.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -27,6 +28,7 @@ public void sort() {
2728
m.updateAnimaciones();
2829
}
2930
}
31+
Barras.finSort = true;
3032
}
3133

3234
@Override

‎src/Sorts/Algoritmos/Merge.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -15,6 +16,7 @@ public Merge(Main m) {
1516
public void sort() {
1617
setInicio(System.currentTimeMillis());
1718
sortingMerge(0, n.length - 1);
19+
Barras.finSort = true;
1820
}
1921

2022
public void sortingMerge(int left, int right) {

‎src/Sorts/Algoritmos/OddEven.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -41,7 +42,7 @@ public void sort() {
4142
}
4243
m.textos();
4344
}
44-
45+
Barras.finSort = true;
4546
}
4647

4748
@Override

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /