diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html
index 2ddd7e75..1b684615 100644
--- a/docs/allclasses-frame.html
+++ b/docs/allclasses-frame.html
@@ -2,9 +2,9 @@
-
+
All Classes
-All Classes
-Constant Field Values
-meico.*
public static final java.lang.String
version "0.8.46""0.8.47"Deprecated List
-API Help
-A-Index
-A
activity Goto
+add(TempoMap.TempoMapSimplificationResults) TempoMap.TempoMapSimplificationResults
+combine the provided instance into this one
+
add(FeatureVector) FeatureVector
This adds up the energy and note ids of two feature vectors.
diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html
index 3c8f37a1..81a40958 100644
--- a/docs/index-files/index-10.html
+++ b/docs/index-files/index-10.html
@@ -2,9 +2,9 @@
-
+
J-Index
-K-Index
-L-Index
-M-Index
-N-Index
-O-Index
-P-Index
-Q-Index
-R-Index
-R
just a helper method for prettyXml()
+ replacements TempoMap.TempoMapSimplificationResults
reset() Helper
this method is called when making a new movement
diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html
index 83fc7dc4..8a8bcb09 100644
--- a/docs/index-files/index-19.html
+++ b/docs/index-files/index-19.html
@@ -2,9 +2,9 @@
-
+
S-Index
-S
convert a short to a byte array
+ simplify(int) TempoMap
+simplifies the whole tempoMap at once
+
+simplify(ArrayList<TempoData>, boolean, int) TempoMap
+simplify a monotonic series of tempo instructions
+
+simplify(TempoData, double, int) TempoMap
+simplify a single tempo instruction
+
+simplifyFast(TempoData) TempoMap
+a faster version of simplify(TempoData tempo, double equalTempoRange, int ppq);
+ this method simplifies a single tempo instruction to a constant tempo; it does not compute timing error
+
size() GenericMap
get the number of entries in the map
diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html
index f263a526..a92f6094 100644
--- a/docs/index-files/index-2.html
+++ b/docs/index-files/index-2.html
@@ -2,9 +2,9 @@
-
+
B-Index
-T-Index
-T
constructor, generates an instance from xml code
+ TempoMap.TempoMapSimplificationResults meico.mpm.elements.maps
+This class gives information about the changes that are done to the tempoMap in the process of simplification.
+
+TempoMapSimplificationResults() TempoMap.TempoMapSimplificationResults
temporalSpread OrnamentDef
TemporalSpread() OrnamentDef.TemporalSpread U-Index
-V-Index
-W-Index
-X-Index
-C-Index
-D-Index
-D
this method removes all empty maps;
this is to make the data a bit smaller and less cluttered
+deletions TempoMap.TempoMapSimplificationResults
detuneCents ArticulationData
detuneCents ArticulationDef E-Index
-E
this little helper method makes sure that the protraction value is valid
+error TempoMap.TempoMapSimplificationResults
EventMaker meico.midi
This helper class provides some useful midi-related functions.
diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html
index 348df69d..c18426d4 100644
--- a/docs/index-files/index-6.html
+++ b/docs/index-files/index-6.html
@@ -2,9 +2,9 @@
-
+
F-Index
-G-Index
-H-Index
-I-Index
-Generated Documentation (Untitled)
diff --git a/docs/meico/audio/Audio.html b/docs/meico/audio/Audio.html
index 1ece534e..5f5a34cc 100644
--- a/docs/meico/audio/Audio.html
+++ b/docs/meico/audio/Audio.html
@@ -2,9 +2,9 @@
-
+
Audio
-AudioPlayer
-Uses of Class meico.audio.Audio
-Uses of Class meico.audio.AudioPlayer
-meico.audio
-meico.audio
-meico.audio Class Hierarchy
-Uses of Package meico.audio
-Uses of Class meico.Meico
-Helper
-Mei
-Uses of Class meico.mei.Helper
-Uses of Class meico.mei.Mei
-meico.mei
-meico.mei
-meico.mei Class Hierarchy
-Uses of Package meico.mei
-EventMaker
-InstrumentsDictionary
-Midi
-Midi2AudioRenderer
-Midi2MsmConverter
-MidiPlayer
-UnsupportedSoundbankException
-Uses of Class meico.midi.EventMaker
-Uses of Class meico.midi.InstrumentsDictionary
-Uses of Class meico.midi.Midi
-Uses of Class meico.midi.Midi2AudioRenderer
-Uses of Class meico.midi.Midi2MsmConverter
-Uses of Class meico.midi.MidiPlayer
-Uses of Class meico.midi.UnsupportedSoundbankException
-meico.midi
-meico.midi
-meico.midi Class Hierarchy
-Uses of Package meico.midi
-Mpm
-Uses of Class meico.mpm.Mpm
-Dated
-Global
-Header
-Part
-Performance
-Uses of Class meico.mpm.elements.Dated
-Uses of
private Dated Part. dated Global. dated
private Dated Global. dated Part. dated
@@ -135,13 +135,13 @@ Uses of
Dated Part. getDated Global. getDated access the dated environment
Dated Global. getDated Part. getDated access the dated environment
diff --git a/docs/meico/mpm/elements/class-use/Global.html b/docs/meico/mpm/elements/class-use/Global.html
index 0d5a392a..35716ca1 100644
--- a/docs/meico/mpm/elements/class-use/Global.html
+++ b/docs/meico/mpm/elements/class-use/Global.html
@@ -2,9 +2,9 @@
-
+
Uses of Class meico.mpm.elements.Global
-Uses of
private Global Part. global Performance. global
private Global Performance. global Part. global
@@ -145,14 +145,14 @@ Uses of
Global Part. getGlobal access the global environment that this part links to
+Performance. getGlobal access the global information of this performance
Global Performance. getGlobal access the global information of this performance
+Part. getGlobal access the global environment that this part links to
diff --git a/docs/meico/mpm/elements/class-use/Header.html b/docs/meico/mpm/elements/class-use/Header.html
index 95c522c4..9929144e 100644
--- a/docs/meico/mpm/elements/class-use/Header.html
+++ b/docs/meico/mpm/elements/class-use/Header.html
@@ -2,9 +2,9 @@
-
+
Uses of Class meico.mpm.elements.Header
-Uses of
private Header Part. header Global. header
private Header Global. header Part. header
@@ -141,13 +141,13 @@ Uses of
Header Part. getHeader Global. getHeader access the header environment
Header Global. getHeader Part. getHeader access the header environment
diff --git a/docs/meico/mpm/elements/class-use/Part.html b/docs/meico/mpm/elements/class-use/Part.html
index 3c17d9d5..e8d113e4 100644
--- a/docs/meico/mpm/elements/class-use/Part.html
+++ b/docs/meico/mpm/elements/class-use/Part.html
@@ -2,9 +2,9 @@
-
+
Uses of Class meico.mpm.elements.Part
-Uses of Class meico.mpm.elements.Performance
-ArticulationMap
-AsynchronyMap
-DynamicsMap
-GenericMap
-ImprecisionMap
-MetricalAccentuationMap
-OrnamentationMap
-RubatoMap
-TempoMap.TempoMapSimplificationResults
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+meico.mpm.elements.maps.TempoMap.TempoMapSimplificationResults
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+error
+public double error
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
TempoMap
-
Frames
Summary:
-Nested |
+Nested | Field | Constr | Method Class TempoMap
+
+
+
+
+
+Nested Class Summary
+
+Nested Classes
+Modifier and Type
+Class and Description
+
+
+class TempoMap.TempoMapSimplificationResults This class gives information about the changes that are done to the tempoMap in the process of simplification.
+
+
+
+
+TempoMap.TempoMapSimplificationResults simplify TempoData > series,
+ boolean toConstant,
+ int ppq)simplify a monotonic series of tempo instructions
+
+
+TempoMap.TempoMapSimplificationResults simplify simplifies the whole tempoMap at once
+
+
+TempoMap.TempoMapSimplificationResults simplify TempoData tempo,
+ double equalTempoRange,
+ int ppq)simplify a single tempo instruction
+
+
+TempoData simplifyFast TempoData tempo)a faster version of simplify(TempoData tempo, double equalTempoRange, int ppq);
+ this method simplifies a single tempo instruction to a constant tempo; it does not compute timing error
+
@@ -746,7 +796,7 @@ computeMillisecondsForConstantTempo
-
+
computeMillisecondsForTempoTransition
private static double computeMillisecondsForTempoTransition(double date,
@@ -763,6 +813,78 @@ computeMillisecondsForTempoTransition
+
+
+
+
+
+
+
+
+
+simplify
+public TempoMap.TempoMapSimplificationResults simplify(java.util.ArrayList<TempoData > series,
+ boolean toConstant,
+ int ppq)
+simplify a monotonic series of tempo instructions
+
+Parameters: series - the series of tempo data to simplify; the first instruction will be edited, the last remains unchanged, all in-between will be deletedppq - toConstant - set true if the series should be simplified to a constant instructionReturns: a data structure indicating all the alterations to the tempoMap
+
+
+
+
+
+
+
+
+simplify
+public TempoMap.TempoMapSimplificationResults simplify(TempoData tempo,
+ double equalTempoRange,
+ int ppq)
+simplify a single tempo instruction
+
+Parameters: tempo - must have all required information that are generated via TempoMap.getTempoDataOf(i)equalTempoRange - the maximum tempo difference allowed to make the tempo constantppq - Returns:
+
+
+
+
+
+
+
+simplifyFast
+public TempoData simplifyFast(TempoData tempo)
+a faster version of simplify(TempoData tempo, double equalTempoRange, int ppq);
+ this method simplifies a single tempo instruction to a constant tempo; it does not compute timing error
+
+Parameters: tempo - the tempo instruction must be member of this tempoMapReturns: the new tempo instruction by which tempo has been replaced
+
+
+
@@ -792,7 +914,7 @@ computeMillisecondsForTempoTransition
Frames computeMillisecondsForTempoTransition
+
meico.mpm.elements.maps.TempoMap.TempoMapSimplificationResults
diff --git a/docs/meico/mpm/elements/maps/package-use.html b/docs/meico/mpm/elements/maps/package-use.html
index 62388df8..a51583c2 100644
--- a/docs/meico/mpm/elements/maps/package-use.html
+++ b/docs/meico/mpm/elements/maps/package-use.html
@@ -2,9 +2,9 @@
-
+
Uses of Package meico.mpm.elements.maps
-
+
@@ -230,6 +230,11 @@
Uses of Packag
This class interfaces MPM's tempoMaps
+
+TempoMap.TempoMapSimplificationResults
+This class gives information about the changes that are done to the tempoMap in the process of simplification.
+
diff --git a/docs/meico/mpm/elements/metadata/Author.html b/docs/meico/mpm/elements/metadata/Author.html
index d48ec297..a518b925 100644
--- a/docs/meico/mpm/elements/metadata/Author.html
+++ b/docs/meico/mpm/elements/metadata/Author.html
@@ -2,9 +2,9 @@
-
+
Author
-Comment
-Metadata
-RelatedResource
-Uses of Class meico.mpm.elements.metadata.Author
-Uses of Class meico.mpm.elements.metadata.Comment
-Uses of Class meico.mpm.elements.metadata.Metadata
-Uses of Class meico.mpm.elements.metadata.RelatedResource
-meico.mpm.elements.metadata
-meico.mpm.elements.metadata
-meico.mpm.elements.metadata Class Hierarchy
-Uses of Package meico.mpm.elements.metadata
-meico.mpm.elements
-meico.mpm.elements
-meico.mpm.elements Class Hierarchy
-Uses of Package meico.mpm.elements
-ArticulationStyle
-DynamicsStyle
-GenericStyle
-MetricalAccentuationStyle
-OrnamentationStyle
-RubatoStyle
-TempoStyle
-Uses of Class meico.mpm.elements.styles.ArticulationStyle
-Uses of Class meico.mpm.elements.styles.DynamicsStyle
-Uses of Class meico.mpm.elements.styles.GenericStyle
-Uses of Class meico.mpm.elements.styles.MetricalAccentuationStyle
-Uses of Class meico.mpm.elements.styles.OrnamentationStyle
-Uses of Class meico.mpm.elements.styles.RubatoStyle
-Uses of Class meico.mpm.elements.styles.TempoStyle
-AbstractDef
-AccentuationPatternDef
-ArticulationDef
-DynamicsDef
-OrnamentDef.DynamicsGradient
-OrnamentDef.TemporalSpread.FrameDomain
-OrnamentDef.TemporalSpread.NoteOffShift
-OrnamentDef.TemporalSpread
-OrnamentDef
-RubatoDef
-TempoDef
-Uses of Class meico.mpm.elements.styles.defs.AbstractDef
-Uses of Class meico.mpm.elements.styles.defs.AccentuationPatternDef
-Uses of Class meico.mpm.elements.styles.defs.ArticulationDef
-Uses of Class meico.mpm.elements.styles.defs.DynamicsDef
-Uses of Class meico.mpm.elements.styles.defs.OrnamentDef.DynamicsGradient
-Uses of Class meico.mpm.elements.styles.defs.OrnamentDef.TemporalSpread.FrameDomain
-Uses of Class meico.mpm.elements.styles.defs.OrnamentDef.TemporalSpread.NoteOffShift
-Uses of Class meico.mpm.elements.styles.defs.OrnamentDef.TemporalSpread
-Uses of Class meico.mpm.elements.styles.defs.OrnamentDef
-Uses of Class meico.mpm.elements.styles.defs.RubatoDef
-Uses of Class meico.mpm.elements.styles.defs.TempoDef
-meico.mpm.elements.styles.defs
-meico.mpm.elements.styles.defs
-meico.mpm.elements.styles.defs Class Hierarchy
-Enum Hierarchy
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
diff --git a/docs/meico/mpm/elements/styles/defs/package-use.html b/docs/meico/mpm/elements/styles/defs/package-use.html
index 6cd424e5..4d474d65 100644
--- a/docs/meico/mpm/elements/styles/defs/package-use.html
+++ b/docs/meico/mpm/elements/styles/defs/package-use.html
@@ -2,9 +2,9 @@
-
+
Uses of Package meico.mpm.elements.styles.defs
-meico.mpm.elements.styles
-meico.mpm.elements.styles
-meico.mpm.elements.styles Class Hierarchy
-Uses of Package meico.mpm.elements.styles
-meico.mpm
-meico.mpm
-meico.mpm Class Hierarchy
-Uses of Package meico.mpm
-AbstractMsm
-Goto
-Msm
-Uses of Class meico.msm.AbstractMsm
-Uses of Class meico.msm.Goto
-Uses of Class meico.msm.Msm
-meico.msm
-meico.msm
-meico.msm Class Hierarchy
-Uses of Package meico.msm
-MusicXml
-Uses of Class meico.musicxml.MusicXml
-meico.musicxml
-meico.musicxml
-meico.musicxml Class Hierarchy
-Uses of Package meico.musicxml
-meico
-meico
-meico Class Hierarchy
-Uses of Package meico
-FeatureElement
-FeatureVector
-Key
-Pitches
-Uses of Class meico.pitches.FeatureElement
-Uses of Class meico.pitches.FeatureVector
-Uses of Class meico.pitches.Key
-Uses of Class meico.pitches.Pitches
-meico.pitches
-meico.pitches
-meico.pitches Class Hierarchy
-Uses of Package meico.pitches
-ColorCoding
-KeyValue
-RandomNumberProvider
-Uses of Class meico.supplementary.ColorCoding
-Uses of Class meico.supplementary.KeyValue
-
diff --git a/docs/meico/supplementary/class-use/RandomNumberProvider.html b/docs/meico/supplementary/class-use/RandomNumberProvider.html
index 9be7b354..61500425 100644
--- a/docs/meico/supplementary/class-use/RandomNumberProvider.html
+++ b/docs/meico/supplementary/class-use/RandomNumberProvider.html
@@ -2,9 +2,9 @@
-
+
Uses of Class meico.supplementary.RandomNumberProvider
-meico.supplementary
-meico.supplementary
-meico.supplementary Class Hierarchy
-Uses of Package meico.supplementary
-Svg
-SvgCollection
-Uses of Class meico.svg.Svg
-Uses of Class meico.svg.SvgCollection
-meico.svg
-meico.svg
-meico.svg Class Hierarchy
-Uses of Package meico.svg
-AbstractXmlSubtree
-XmlBase
-Uses of Class meico.xml.AbstractXmlSubtree
-Uses of Class meico.xml.XmlBase
-meico.xml
-meico.xml
-meico.xml Class Hierarchy
-Uses of Package meico.xml
-Overview List
-Overview
-Class Hierarchy
-Class Hierarchy
meico.mpm.elements.maps.data.RubatoData
meico.svg.SvgCollection
meico.mpm.elements.maps.data.TempoData
+meico.mpm.elements.maps.TempoMap.TempoMapSimplificationResults
java.lang.Throwable (implements java.io.Serializable)
java.lang.Exception
diff --git a/docs/serialized-form.html b/docs/serialized-form.html
index 13f50319..b7130c2c 100644
--- a/docs/serialized-form.html
+++ b/docs/serialized-form.html
@@ -2,9 +2,9 @@
-
+
Serialized Form
- tempi = new ArrayList<>();
for (int i = 0; i < this.size(); ++i) {
- if (this.elements.get(i).getValue().getLocalName().equals("tempo")) {
+ if (this.elements.get(i).getValue().getLocalName().equals("tempo")) { // we do not want to process switch elements
TempoData tempo = this.getTempoDataOf(i);
- tempi.add(tempo);
// some regularisation to simplify further processing
+ if (tempo.bpm == null)
+ tempo.bpm = tempo.transitionTo;
if (tempo.transitionTo == null)
tempo.transitionTo = tempo.bpm;
- else if (tempo.bpm == null)
- tempo.bpm = tempo.transitionTo;
+ if (tempo.transitionTo == null) // this is still true when both are null, bpm and transitionTo
+ continue; // tempo instruction not valid, we ignore it
+
+ tempi.add(tempo);
}
}
+ TempoMapSimplificationResults results = new TempoMapSimplificationResults();
+
// there must be at least 3 tempo instructions in the map
if (tempi.size() < 3)
- return 0.0;
+ return results;
- double error = 0.0;
+ results.error = 0.0;
ArrayList series = new ArrayList<>(); // this holds the series of tempo instructions to be simplified
double monotony = 0.0; // monotonously rising = 1, falling = -1, constant = 0
+ double prevTransitionTo = 0.0;
- for (TempoData tempo : tempi) {
- if (series.isEmpty()) {
- series.add(tempo); // add this instruction to the series
+ for (int i = 0; i < tempi.size(); ++i) {
+ TempoData tempo = tempi.get(i);
+
+ if (!series.isEmpty()) {
+ if (series.get(series.size() - 1).startDate >= tempo.startDate) { // if this instruction has the same startDate as the previous instruction
+ series.remove(--i); // remove the previous one, decrement the counter
+ continue; // enter the loop again with the current instruction
+ }
+ } else { // if the series is empty just add this instruction and compute the initial values needed in the next iteration
+ series.add(tempo);
double tempoDiff = tempo.transitionTo - tempo.bpm;
- monotony = (Math.abs(tempoDiff) < equalTempoRange) ? 0.0 : Math.signum(tempoDiff); // monotonously rising = 1, falling = -1, constant = 0
+ monotony = Math.signum(tempoDiff);
+ prevTransitionTo = tempo.transitionTo * tempo.beatLength * 4.0; // regularise the transitionTo value to the beatLength of a quarter
continue;
- } else if (tempo.beatLength != series.get(0).beatLength) { // make sure that all tempo values have the same beatLength basis as the first instruction
- tempo.bpm = (tempo.bpm * tempo.beatLength) / series.get(0).beatLength;
- tempo.transitionTo = (tempo.transitionTo * tempo.beatLength) / series.get(0).beatLength;
}
- // if we have a series of tempo instructions, check if the monotony changes, thus the series would end and get simplified
- double diffToPrev = tempo.bpm - series.get(series.size() - 1).transitionTo; // compute tempo difference to the previous instruction's transitionTo value
- double monotonyToPrev = (Math.abs(diffToPrev) < equalTempoRange) ? monotony : Math.signum(diffToPrev); // if the tempo step is in the equality range, we keep the monotony, otherwise we take it from the signum
-
- double innerDiff = tempo.transitionTo - tempo.bpm;
- double innerMonotony = (Math.abs(innerDiff) < equalTempoRange) ? monotony : Math.signum(innerDiff); // if the tempo transition is in the equality range, we keep the monotony, otherwise we take it from the signum
-
- // does this instruction end the series? (this is also the case when this is the last instruction in tempi)
- if (monotony == 0.0) { // constant tempo
- if (series.size() > 1) { // there are more than on tempo instruction in the series, so this might be a candidate for simplification to a constant tempo
- if (monotonyToPrev == 0.0) { // connection is constant
- if (innerMonotony != 0.0) { // ...___/ or inverse
- series.add(tempo);
- error += this.simplify(series, true, ppq); // simplify the series to constant
- series.clear(); // start the series anew
- monotony = innerMonotony;
- }
- } else { // connection is monotonously rising or falling
- error += this.simplify(series, true, ppq); // simplify the series to constant
- TempoData prev = series.get(series.size() - 1);
- series.clear(); // start the series anew
- if (monotonyToPrev == -innerMonotony) { // with the current instruction (is done after the else block anyway)
- monotony = innerMonotony;
- } else {
- series.add(prev); // with the previous instruction
- monotony = monotonyToPrev;
- }
- }
- } else { // there is just one instruction in the series
- if (monotonyToPrev == 0.0) {
- if (innerMonotony != 0.0) // _/ or inverse
- monotony = innerMonotony;
- } else {
- if (monotonyToPrev == -innerMonotony) { // -/ or inverse or _\ or inverse
- series.clear(); // start the series anew
- monotony = innerMonotony;
- }
- }
- }
- series.add(tempo);
- } else { // non-constant tempo, i.e. monotonously rising or falling
- if (series.size() > 1) { // there are more than one instruction in the series, so this might be a candidate for simplification
- if ((monotonyToPrev == monotony) || (monotonyToPrev == 0.0)) {
- if (monotony != innerMonotony) { // /\ or \/ or \_ or inverse
- series.add(tempo);
- error += this.simplify(series, false, ppq); // simplify to continuous transition
- series.clear();
- monotony = innerMonotony;
- }
- } else { // the connection has opposite monotony
- error += this.simplify(series, false, ppq); // simplify to continuous transition
- TempoData prev = series.get(series.size() - 1);
- series.clear(); // start the series anew
- if (monotonyToPrev == -innerMonotony) { // with the current instruction (is done after the else block anyway)
- monotony = innerMonotony;
- } else {
- series.add(prev); // with the previous instruction
- monotony = monotonyToPrev;
- }
- }
- } else { // there is just one instruction in the series
- if ((monotonyToPrev == monotony) || (monotonyToPrev == 0.0)) {
- if (innerMonotony == -monotony) { // /\ or \/
- series.clear(); // start the series anew
- monotony = innerMonotony;
- }
- } else { // the connection has opposite monotony
- series.clear();
+ double bpmRegularised = tempo.bpm * tempo.beatLength * 4.0; // the variable for the regularised bpm tempo to the beathLength of a quarter
+ double transitionToRegularised = tempo.transitionTo * tempo.beatLength * 4.0; // the variable for the regularised transitionTo tempo to the beathLength of a quarter
+
+ double diffToPrev = bpmRegularised - prevTransitionTo;
+ double monotonyToPrev = Math.signum(diffToPrev);
+
+ double innerDiff = transitionToRegularised - bpmRegularised;
+ double innerMonotony = Math.signum(innerDiff);
+
+ // check for all conditions to just continue the series
+ if (((monotony == 0.0) && (monotonyToPrev != - innerMonotony))
+ || ((monotonyToPrev == 0.0) && (innerMonotony == monotony))
+ || ((monotonyToPrev == monotony) && (innerMonotony != -monotony))) {
+
+ if (monotony == 0.0) {
+ if (monotonyToPrev != 0.0)
+ monotony = monotonyToPrev;
+ else
monotony = innerMonotony;
- }
}
+
+ prevTransitionTo = transitionToRegularised;
series.add(tempo);
+ continue;
}
- }
- this.simplify(series, false, ppq); // simplify the final series of instructions, if possible
+ // if we reach this point, the tempo instruction ends the series
+ series.add(tempo); // this tempo instruction ends the series
+ results.add(this.simplify(series, false, ppq)); // simplify to continuous transition
+ series.clear(); // start a new series
+ series.add(tempo);
+ monotony = innerMonotony;
+ prevTransitionTo = transitionToRegularised;
+ series.add(tempo);
+ }
+ results.add(this.simplify(series, (monotony == 0.0), ppq)); // simplify the last section until the end of the tempoMap
- return error;
+ return results;
}
/**
@@ -695,15 +670,26 @@ else if (tempo.bpm == null)
* @param series the series of tempo data to simplify; the first instruction will be edited, the last remains unchanged, all in-between will be deleted
* @param ppq
* @param toConstant set true if the series should be simplified to a constant instruction
- * @return the timing error in milliseconds at the end of the simplification frame
+ * @return a data structure indicating all the alterations to the tempoMap
*/
- public double simplify(ArrayList series, boolean toConstant, int ppq) {
- if ((series == null) || (series.size() < 2)) // nothing there to simplify
- return 0.0; // done
+ public TempoMapSimplificationResults simplify(ArrayList series, boolean toConstant, int ppq) {
+ if (series == null) // nothing there to simplify
+ return new TempoMapSimplificationResults(); // done
+
+ // make sure that no two or more instructions have the same startDate
+ for (int i = 1; i < series.size(); ++i) {
+ if (series.get(i - 1).startDate >= series.get(i).startDate)
+ series.remove(--i);
+ }
+
+ if (series.size() < 2) // not enough there to simplify
+ return new TempoMapSimplificationResults(); // done
double millisecondsOld = 0.0;
if (toConstant) {
+ TempoMapSimplificationResults results = new TempoMapSimplificationResults();
+
// compute the timing from the first instruction in the series to the beginning of the last instruction
for (int i = 1; i < series.size(); ++i)
millisecondsOld += TempoMap.computeDiffTiming(series.get(i).startDate, ppq, series.get(i - 1));
@@ -720,17 +706,19 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
// newTempo.transitionTo = newTempo.bpm;
// do the updating and housekeeping
- for (int i = series.size() - 2; i >= 0; --i) // the last instruction remains untouched; all others are deleted
+ for (int i = series.size() - 2; i >= 0; --i) { // the last instruction remains untouched; all others are deleted
+ results.deletions.add(series.get(i));
this.removeElement(series.get(i).xml);
+ }
- this.addTempo(newTempo); // add the new instruction to the map
-
- return 0.0;
+ newTempo.xml = this.getElement(this.addTempo(newTempo)); // add the new instruction to the map
+ results.replacements.add(new KeyValue<>(series.get(0), newTempo));
+ return results; // done
}
// as we want to simplify to continuous tempo we need at least 3 instructions in the series
if (series.size() < 3)
- return 0.0;
+ return new TempoMapSimplificationResults(); // done
// make sure every instruction, except for the last one, has a bpm and transitionTo value, also store the min and max tempo values
double minTempo = series.get(0).bpm;
@@ -741,7 +729,7 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
if (tempo.bpm == null) {
if (tempo.transitionTo == null) {
System.err.println("Error when simplifying tempoMap: A tempo element contains neither a bpm nor transitionTo value. Cancelling operation.");
- return 0.0;
+ return new TempoMapSimplificationResults(); // done
}
tempo.bpm = tempo.transitionTo;
}
@@ -757,10 +745,13 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
}
}
- if (minTempo == maxTempo) { // constant or monotony == 0.0
- for (int i = series.size() - 2; i > 0; --i) // the first and last instruction remain untouched; all in-between are deleted
+ if (minTempo == maxTempo) { // constant or monotony == 0.0
+ TempoMapSimplificationResults results = new TempoMapSimplificationResults();
+ for (int i = series.size() - 2; i > 0; --i) { // the first and last instruction remain untouched; all in-between are deleted
+ results.deletions.add(series.get(i));
this.removeElement(series.get(i).xml);
- return 0.0;
+ }
+ return results; // done
}
// make sure the last instruction has a bpm value
@@ -803,7 +794,7 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
newTempo.endDate = last.startDate;
newTempo.beatLength = series.get(0).beatLength;
newTempo.meanTempoAt = 0.5; // must be computed
- newTempo.exponent = Math.log(0.5) / Math.log(newTempo.meanTempoAt); // same here
+ newTempo.exponent = TempoMap.computeExponent(newTempo.meanTempoAt); // same here
if (Math.signum(preLast.transitionTo - newTempo.bpm) == Math.signum(last.bpm - preLast.transitionTo)) { // if monotony to preLast.transitionTo is equal to the monotony from preLast.transitionTo to last.bpm
newTempo.transitionTo = last.bpm;
@@ -825,17 +816,18 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
}
// bisection
+ TempoMapSimplificationResults results = new TempoMapSimplificationResults();
double min = 0.0;
double max = 1.0;
- double error = TempoMap.computeDiffTiming(newTempo.endDate, ppq, newTempo) - millisecondsOld;
- for (; Math.abs(error) >= 1.0; error = TempoMap.computeDiffTiming(newTempo.endDate, ppq, newTempo) - millisecondsOld) {
+ results.error = TempoMap.computeDiffTiming(newTempo.endDate, ppq, newTempo) - millisecondsOld;
+ for (; Math.abs(results.error) >= 1.0; results.error = TempoMap.computeDiffTiming(newTempo.endDate, ppq, newTempo) - millisecondsOld) {
if (isRitardando) {
- if (error > 0.0)
+ if (results.error > 0.0)
min = newTempo.meanTempoAt;
else
max = newTempo.meanTempoAt;
- } else { // is accelerando
- if (error > 0.0)
+ } else { // is accelerando
+ if (results.error > 0.0)
max = newTempo.meanTempoAt;
else
min = newTempo.meanTempoAt;
@@ -843,18 +835,20 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
newTempo.meanTempoAt = (min + max) * 0.5;
if (Math.abs(newTempo.meanTempoAt) >= 0.9999999999999999) // if we run into numeric issues (and infinite loop as a consequence)
- return this.simplify(series, true, ppq); // simplify the series to constant
+ return this.simplify(series, true, ppq); // simplify the series to constant
- newTempo.exponent = Math.log(0.5) / Math.log(newTempo.meanTempoAt);
+ newTempo.exponent = TempoMap.computeExponent(newTempo.meanTempoAt);
}
// do the updating and housekeeping
- for (int i = series.size() - 2; i >= 0; --i) // the last instruction remains untouched; all others are deleted
+ for (int i = series.size() - 2; i >= 0; --i) { // the last instruction remains untouched; all others are deleted
+ results.deletions.add(series.get(i));
this.removeElement(series.get(i).xml);
+ }
+ newTempo.xml = this.getElement(this.addTempo(newTempo)); // add the new instruction to the map
+ results.replacements.add(new KeyValue<>(series.get(0), newTempo));
- this.addTempo(newTempo); // add the new instruction to the map
-
- return error;
+ return results;
}
/**
@@ -862,26 +856,30 @@ public double simplify(ArrayList series, boolean toConstant, int ppq)
* @param tempo must have all required information that are generated via TempoMap.getTempoDataOf(i)
* @param equalTempoRange the maximum tempo difference allowed to make the tempo constant
* @param ppq
- * @return the timing error in milliseconds introduced by simplification
+ * @return
*/
- public double simplify(TempoData tempo, double equalTempoRange, int ppq) {
+ public TempoMapSimplificationResults simplify(TempoData tempo, double equalTempoRange, int ppq) {
double tempoDiff = tempo.transitionTo - tempo.bpm;
- if ((tempoDiff == 0.0) || (Math.abs(tempoDiff) > equalTempoRange)) // if it is already a constant tempo or the continuous transition is too pronounced to make it constant
- return 0.0; // done
+ if ((tempoDiff == 0.0) || (Math.abs(tempoDiff) > equalTempoRange)) // if it is already a constant tempo or the continuous transition is too pronounced to make it constant
+ return new TempoMapSimplificationResults(); // done
double millisecondsOld = TempoMap.computeDiffTiming(tempo.endDate, ppq, tempo);
- this.simplifyFast(tempo);
- return TempoMap.computeDiffTiming(tempo.endDate, ppq, tempo) - millisecondsOld; // compute the timing error
+
+ TempoMapSimplificationResults results = new TempoMapSimplificationResults();
+ results.replacements.add(new KeyValue<>(tempo, this.simplifyFast(tempo)));
+ results.error = TempoMap.computeDiffTiming(tempo.endDate, ppq, tempo) - millisecondsOld; // compute the timing error
+ return results;
}
/**
* a faster version of simplify(TempoData tempo, double equalTempoRange, int ppq);
* this method simplifies a single tempo instruction to a constant tempo; it does not compute timing error
* @param tempo the tempo instruction must be member of this tempoMap
+ * @return the new tempo instruction by which tempo has been replaced
*/
- public void simplifyFast(TempoData tempo) {
+ public TempoData simplifyFast(TempoData tempo) {
if (!this.contains(tempo.xml))
- return;
+ return tempo;
// some regularisation to simplify further processing
if (tempo.transitionTo == null)
@@ -896,9 +894,30 @@ else if (tempo.bpm == null)
tempo.bpm = (tempo.bpm + tempo.transitionTo) * 0.5;
tempo.transitionTo = tempo.bpm;
- // remove the old tempo entry, crceate and add a new one to the tempoMap
+ // remove the old tempo entry, create and add a new one to the tempoMap
this.removeElement(tempo.xml);
tempo.xml = null;
- this.addTempo(tempo);
+ tempo.xml = this.getElement(this.addTempo(tempo));
+ return tempo;
+ }
+
+ /**
+ * This class gives information about the changes that are done to the tempoMap in the process of simplification.
+ * @author Axel Berndt
+ */
+ public class TempoMapSimplificationResults {
+ public double error = 0.0;
+ public ArrayList deletions = new ArrayList<>();
+ public ArrayList> replacements = new ArrayList<>();
+
+ /**
+ * combine the provided instance into this one
+ * @param addThis
+ */
+ public void add(TempoMapSimplificationResults addThis) {
+ this.error += addThis.error;
+ this.deletions.addAll(addThis.deletions);
+ this.replacements.addAll(addThis.replacements);
+ }
}
}