code format
This commit is contained in:
parent
67ad82d52e
commit
bf1ba6efc0
17 changed files with 75 additions and 78 deletions
|
|
@ -541,35 +541,34 @@ export class Pattern {
|
|||
defragmentHaps() {
|
||||
// remove continuous haps
|
||||
const pat = this.discreteOnly();
|
||||
|
||||
|
||||
return pat.withHaps((haps) => {
|
||||
const result = [];
|
||||
for (var i=0; i < haps.length; ++i) {
|
||||
for (var i = 0; i < haps.length; ++i) {
|
||||
var searching = true;
|
||||
var a = haps[i];
|
||||
while (searching) {
|
||||
const a_value = JSON.stringify(haps[i].value);
|
||||
var found = false;
|
||||
|
||||
for(var j=i+1; j<haps.length; j++) {
|
||||
for (var j = i + 1; j < haps.length; j++) {
|
||||
const b = haps[j];
|
||||
|
||||
if (a.whole.equals(b.whole)) {
|
||||
if (a.part.begin.eq(b.part.end)) {
|
||||
if (a_value === JSON.stringify(b.value)) {
|
||||
// eat the matching hap into 'a'
|
||||
a = new Hap(a.whole, new TimeSpan(b.part.begin, a.part.end), a.value)
|
||||
haps.splice(j,1);
|
||||
a = new Hap(a.whole, new TimeSpan(b.part.begin, a.part.end), a.value);
|
||||
haps.splice(j, 1);
|
||||
// restart the search
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (b.part.begin.eq(a.part.end)) {
|
||||
} else if (b.part.begin.eq(a.part.end)) {
|
||||
if (a_value == JSON.stringify(b.value)) {
|
||||
// eat the matching hap into 'a'
|
||||
a = new Hap(a.whole, new TimeSpan(a.part.begin, b.part.end), a.value)
|
||||
haps.splice(j,1);
|
||||
a = new Hap(a.whole, new TimeSpan(a.part.begin, b.part.end), a.value);
|
||||
haps.splice(j, 1);
|
||||
// restart the search
|
||||
found = true;
|
||||
break;
|
||||
|
|
@ -577,7 +576,7 @@ export class Pattern {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
searching = found;
|
||||
}
|
||||
result.push(a);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue