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 4fdc9f7

Browse files
author
javiluli
committed
Creo el metodo updateAnimaciones() y updateAnimacionesSinTiempo()
1 parent 743c865 commit 4fdc9f7

File tree

15 files changed

+43
-100
lines changed

15 files changed

+43
-100
lines changed

‎src/Sorts/Algoritmos/Bubble.java

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

3-
import Adicionales.*;
43
import Interfaz.Sort;
5-
import Principal.*;
4+
import Principal.Main;
65
import Sorts.Sorts;
76

87
public class Bubble extends Sorts implements Sort {
@@ -24,10 +23,7 @@ public void sort() {
2423
cambiosArray++;
2524
}
2625
accesoArray += 2;
27-
m.textos();
28-
setFin(System.currentTimeMillis());
29-
Main.getPanelBarras().repaint();
30-
Delay.delay();
26+
m.updateAnimaciones();
3127
}
3228
m.textos();
3329
}

‎src/Sorts/Algoritmos/Cocktail.java

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

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -30,10 +29,7 @@ public void sort() {
3029
cambiar = true;
3130
cambiosArray++;
3231
}
33-
m.textos();
34-
setFin(System.currentTimeMillis());
35-
Main.getPanelBarras().repaint();
36-
Delay.delay();
32+
m.updateAnimaciones();
3733
}
3834

3935
if (cambiar == false)
@@ -51,12 +47,8 @@ public void sort() {
5147
cambiar = true;
5248
cambiosArray++;
5349
}
54-
m.textos();
55-
setFin(System.currentTimeMillis());
56-
Main.getPanelBarras().repaint();
57-
Delay.delay();
50+
m.updateAnimaciones();
5851
}
59-
6052
inicio = inicio + 1;
6153
}
6254
}

‎src/Sorts/Algoritmos/Cycle.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public void sort() {
1616
setInicio(System.currentTimeMillis());
1717
int writes = 0;
1818
for (int cycle_start = 0; cycle_start <= n.length - 2; cycle_start++) {
19+
accesoArray++;
1920
int item = n[cycle_start];
2021

2122
int pos = cycle_start;
@@ -37,6 +38,7 @@ public void sort() {
3738
}
3839

3940
while (pos != cycle_start) {
41+
accesoArray++;
4042
pos = cycle_start;
4143

4244
for (int i = cycle_start + 1; i < n.length; i++)
@@ -51,17 +53,10 @@ public void sort() {
5153
item = n[pos];
5254
n[pos] = temp;
5355
writes++;
56+
cambiosArray++;
5457
}
55-
m.textos();
56-
setFin(System.currentTimeMillis());
57-
Main.getPanelBarras().repaint();
58-
Delay.delay();
59-
58+
m.updateAnimaciones();
6059
}
61-
m.textos();
62-
setFin(System.currentTimeMillis());
63-
Main.getPanelBarras().repaint();
64-
Delay.delay();
6560
}
6661
}
6762

‎src/Sorts/Algoritmos/Gnome.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package Sorts.Algoritmos;
22

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -29,10 +28,7 @@ public void sort() {
2928
index--;
3029
cambiosArray++;
3130
}
32-
m.textos();
33-
setFin(System.currentTimeMillis());
34-
Main.getPanelBarras().repaint();
35-
Delay.delay();
31+
m.updateAnimaciones();
3632
}
3733
}
3834

‎src/Sorts/Algoritmos/Heap.java

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

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -18,21 +17,16 @@ public void sort() {
1817

1918
for (int i = len / 2 - 1; i >= 0; i--) {
2019
heapify(n, len, i);
21-
m.textos();
22-
setFin(System.currentTimeMillis());
23-
Main.getPanelBarras().repaint();
24-
Delay.delay();
20+
m.updateAnimaciones();
21+
;
2522
}
2623

2724
for (int i = len - 1; i >= 0; i--) {
2825
int temp = n[0];
2926
n[0] = n[i];
3027
n[i] = temp;
3128

32-
m.textos();
33-
setFin(System.currentTimeMillis());
34-
Main.getPanelBarras().repaint();
35-
Delay.delay();
29+
m.updateAnimaciones();
3630
heapify(n, i, 0);
3731
}
3832
}

‎src/Sorts/Algoritmos/Inserccion.java

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

3-
import Adicionales.*;
43
import Interfaz.Sort;
5-
import Principal.*;
4+
import Principal.Main;
65
import Sorts.Sorts;
76

87
public class Inserccion extends Sorts implements Sort {
@@ -25,10 +24,7 @@ public void sort() {
2524
cambiosArray++;
2625
accesoArray += 2;
2726
n[pos] = aux;
28-
setFin(System.currentTimeMillis());
29-
m.textos();
30-
Main.getPanelBarras().repaint();
31-
Delay.delay();
27+
m.updateAnimaciones();
3228
}
3329
}
3430
}

‎src/Sorts/Algoritmos/Merge.java

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

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -57,29 +56,23 @@ void merge(int left, int mitad, int right) {
5756
}
5857
k++;
5958
cambiosArray++;
60-
m.textos();
61-
Main.getPanelBarras().repaint();
62-
Delay.delay();
59+
m.updateAnimacionesSinTiempo();
6360
}
6461

6562
while (i < len_left) {
6663
n[k] = arr_left[i];
6764
i++;
6865
k++;
6966
accesoArray++;
70-
m.textos();
71-
Main.getPanelBarras().repaint();
72-
Delay.delay();
67+
m.updateAnimacionesSinTiempo();
7368
}
7469

7570
while (j < len_right) {
7671
n[k] = arr_right[j];
7772
j++;
7873
k++;
7974
accesoArray++;
80-
m.textos();
81-
Main.getPanelBarras().repaint();
82-
Delay.delay();
75+
m.updateAnimacionesSinTiempo();
8376
}
8477
m.textos();
8578
setFin(System.currentTimeMillis());

‎src/Sorts/Algoritmos/OddEven.java

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

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -27,10 +26,7 @@ public void sort() {
2726
isSorted = false;
2827
cambiosArray++;
2928
}
30-
m.textos();
31-
Main.getPanelBarras().repaint();
32-
setFin(System.currentTimeMillis());
33-
Delay.delay();
29+
m.updateAnimaciones();
3430
}
3531
for (int i = 0; i <= n.length - 2; i = i + 2) {
3632
accesoArray++;
@@ -41,10 +37,7 @@ public void sort() {
4137
isSorted = false;
4238
cambiosArray++;
4339
}
44-
m.textos();
45-
Main.getPanelBarras().repaint();
46-
setFin(System.currentTimeMillis());
47-
Delay.delay();
40+
m.updateAnimaciones();
4841
}
4942
m.textos();
5043
}

‎src/Sorts/Algoritmos/Pancake.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package Sorts.Algoritmos;
22

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -21,10 +20,7 @@ public void sort() {
2120
flip(n, mi);
2221
flip(n, curr_size - 1);
2322
}
24-
m.textos();
25-
setFin(System.currentTimeMillis());
26-
Main.getPanelBarras().repaint();
27-
Delay.delay();
23+
m.updateAnimaciones();
2824
}
2925
}
3026

‎src/Sorts/Algoritmos/Pigeonhole.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package Sorts.Algoritmos;
22

3-
import Adicionales.Delay;
43
import Interfaz.Sort;
54
import Principal.Main;
65
import Sorts.Sorts;
@@ -31,10 +30,7 @@ public void sort() {
3130
while (holes[count]-- > 0) {
3231
n[i++] = count + min;
3332
accesoArray++;
34-
m.textos();
35-
setFin(System.currentTimeMillis());
36-
Main.getPanelBarras().repaint();
37-
Delay.delay();
33+
m.updateAnimaciones();
3834
}
3935
}
4036
}

0 commit comments

Comments
(0)

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