Permalink
Browse files

Removed the deprecated note constructors. Made the note always have a…

… scale (except when a rest) and removed unnecessary scale parameters. Fixed bug in inversion transformer. Fixed bug in the guido output when a pentatonic scale is used.
  • Loading branch information...
1 parent 6e3ffc4 commit 67bde279032a320fd9d5d9111c07c6aa0d767666 @myronmarston committed Jun 28, 2008
Showing with 2,999 additions and 3,112 deletions.
  1. +14 −14 FractalComposer/build/cobertura-report/com.myronmarston.music.Dynamic.html
  2. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.GermIsEmptyException.html
  3. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.IncorrectNoteStringException.html
  4. +30 −30 FractalComposer/build/cobertura-report/com.myronmarston.music.Instrument.html
  5. +41 −41 FractalComposer/build/cobertura-report/com.myronmarston.music.MidiNote.html
  6. +703 −887 FractalComposer/build/cobertura-report/com.myronmarston.music.Note.html
  7. +80 −52 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteList.html
  8. +80 −80 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteName.html
  9. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteStringInvalidPartException.html
  10. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteStringParseException.html
  11. +91 −91 FractalComposer/build/cobertura-report/com.myronmarston.music.OutputManager.html
  12. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.SheetMusicCreator.html
  13. +27 −27 FractalComposer/build/cobertura-report/com.myronmarston.music.Tempo.html
  14. +9 −9 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.ChromaticScale.html
  15. +7 −7 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.HarmonicMinorScale.html
  16. +1 −1 ...alComposer/build/cobertura-report/com.myronmarston.music.scales.InvalidKeySignatureException.html
  17. +32 −32 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.KeySignature.html
  18. +9 −9 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorPentatonicScale.html
  19. +9 −9 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorScale.html
  20. +9 −9 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MinorPentatonicScale.html
  21. +8 −8 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MinorScale.html
  22. +53 −53 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Scale.html
  23. +21 −21 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Tonality.html
  24. +15 −15 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.AbstractVoiceOrSection.html
  25. +119 −119 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.FractalPiece.html
  26. +1 −1 ...omposer/build/cobertura-report/com.myronmarston.music.settings.InvalidTimeSignatureException.html
  27. +1 −1 ...ser/build/cobertura-report/com.myronmarston.music.settings.NonPositiveTimeSignatureException.html
  28. +43 −43 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Section.html
  29. +31 −31 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SectionSettings.html
  30. +36 −36 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SelfSimilaritySettings.html
  31. +41 −41 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.TimeSignature.html
  32. +1 −1 ...bertura-report/com.myronmarston.music.settings.TimeSignatureDenominatorNotAPowerOf2Exception.html
  33. +29 −29 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Voice.html
  34. +39 −39 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceOrSectionList.html
  35. +70 −81 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSection.html
  36. +15 −15 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionHashMapKey.html
  37. +13 −13 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionList.html
  38. +45 −45 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSettings.html
  39. +25 −31 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.InversionTransformer.html
  40. +11 −11 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.OctaveTransformer.html
  41. +5 −5 ...talComposer/build/cobertura-report/com.myronmarston.music.transformers.RetrogradeTransformer.html
  42. +15 −15 ...poser/build/cobertura-report/com.myronmarston.music.transformers.RhythmicDurationTransformer.html
  43. +40 −40 ...omposer/build/cobertura-report/com.myronmarston.music.transformers.SelfSimilarityTransformer.html
  44. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.Transformer.html
  45. +16 −20 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.TransposeTransformer.html
  46. +16 −16 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.VolumeTransformer.html
  47. +15 −15 FractalComposer/build/cobertura-report/com.myronmarston.util.AbstractPublisher.html
  48. +27 −27 FractalComposer/build/cobertura-report/com.myronmarston.util.ClassHelper.html
  49. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.FileHelper.html
  50. +131 −104 FractalComposer/build/cobertura-report/com.myronmarston.util.Fraction.html
  51. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.util.MathHelper.html
  52. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.ProcessRunner.html
  53. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.Publisher.html
  54. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.Subscriber.html
  55. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.ThreadedInputStreamRedirector.html
  56. +1 −1 FractalComposer/build/cobertura-report/frame-sourcefiles-com.myronmarston.music.html
  57. +1 −1 FractalComposer/build/cobertura-report/frame-sourcefiles-com.myronmarston.music.transformers.html
  58. +1 −1 FractalComposer/build/cobertura-report/frame-sourcefiles-com.myronmarston.util.html
  59. +3 −3 FractalComposer/build/cobertura-report/frame-sourcefiles.html
  60. +6 −6 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.html
  61. +1 −1 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.scales.html
  62. +3 −3 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.settings.html
  63. +4 −4 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.transformers.html
  64. +3 −3 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.util.html
  65. +6 −6 FractalComposer/build/cobertura-report/frame-summary.html
  66. +45 −91 FractalComposer/dist/javadoc/com/myronmarston/music/Note.html
  67. +22 −0 FractalComposer/dist/javadoc/com/myronmarston/music/NoteList.html
  68. +3 −3 FractalComposer/dist/javadoc/com/myronmarston/music/NoteName.html
  69. +2 −4 FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiNote.html
  70. +1 −1 FractalComposer/dist/javadoc/com/myronmarston/music/class-use/Note.html
  71. +3 −38 FractalComposer/dist/javadoc/com/myronmarston/music/scales/class-use/Scale.html
  72. +1 −24 FractalComposer/dist/javadoc/com/myronmarston/util/class-use/Fraction.html
  73. +0 −20 FractalComposer/dist/javadoc/deprecated-list.html
  74. +0 −6 FractalComposer/dist/javadoc/index-files/index-12.html
  75. +3 −0 FractalComposer/dist/javadoc/index-files/index-14.html
  76. +1 −1 FractalComposer/dist/javadoc/index-files/index-17.html
  77. +3 −0 FractalComposer/dist/javadoc/index-files/index-18.html
  78. +1 −1 FractalComposer/dist/javadoc/index-files/index-2.html
  79. +1 −1 FractalComposer/dist/javadoc/index-files/index-6.html
  80. +55 −89 FractalComposer/src/com/myronmarston/music/Note.java
  81. +19 −0 FractalComposer/src/com/myronmarston/music/NoteList.java
  82. +1 −1 FractalComposer/src/com/myronmarston/music/NoteName.java
  83. +5 −5 FractalComposer/src/com/myronmarston/music/OutputManager.java
  84. +8 −11 FractalComposer/src/com/myronmarston/music/settings/VoiceSection.java
  85. +7 −8 FractalComposer/src/com/myronmarston/music/transformers/InversionTransformer.java
  86. +1 −2 FractalComposer/src/com/myronmarston/music/transformers/TransposeTransformer.java
  87. +34 −31 FractalComposer/test/com/myronmarston/music/NoteListTest.java
  88. +79 −49 FractalComposer/test/com/myronmarston/music/NoteTest.java
  89. +21 −0 FractalComposer/test/com/myronmarston/music/OutputManagerTest.java
  90. +55 −55 FractalComposer/test/com/myronmarston/music/scales/ScaleTest.java
  91. +24 −20 FractalComposer/test/com/myronmarston/music/settings/FractalPieceTest.java
  92. +85 −9 FractalComposer/test/com/myronmarston/music/settings/PieceTest.java
  93. +4 −4 FractalComposer/test/com/myronmarston/music/settings/SectionSettingsTest.java
  94. +5 −4 FractalComposer/test/com/myronmarston/music/settings/SectionTest.java
  95. +83 −79 FractalComposer/test/com/myronmarston/music/settings/VoiceSectionTest.java
  96. +4 −4 FractalComposer/test/com/myronmarston/music/settings/VoiceSettingsTest.java
  97. +99 −96 FractalComposer/test/com/myronmarston/music/settings/VoiceTest.java
  98. +2 −9 FractalComposer/test/com/myronmarston/music/settings/XmlSerializationTest.java
  99. +46 −30 FractalComposer/test/com/myronmarston/music/transformers/InversionTransformerTest.java
  100. +19 −17 FractalComposer/test/com/myronmarston/music/transformers/OctaveTransformerTest.java
  101. +13 −11 FractalComposer/test/com/myronmarston/music/transformers/RetrogradeTransformerTest.java
  102. +15 −13 FractalComposer/test/com/myronmarston/music/transformers/RhythmicDurationTransformerTest.java
  103. +125 −124 FractalComposer/test/com/myronmarston/music/transformers/SelfSimilarityTransformerTest.java
  104. +13 −12 FractalComposer/test/com/myronmarston/music/transformers/TransposeTransformerTest.java
  105. +15 −13 FractalComposer/test/com/myronmarston/music/transformers/VolumeTransformerTest.java
@@ -69,15 +69,15 @@ <h5>Coverage Report - com.myronmarston.music.Dynamic</h5>
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @author Myron</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;26</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;69</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;28</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; PPP(10),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; PP(25),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;30</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; P(50),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;31</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; MP(60),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;32</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; MF(70),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;33</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; F(85),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; FF(100),</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;21</td> <td class="src"><pre class="src">&nbsp; FFF(120);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;70</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;28</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; PPP(10),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; PP(25),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;30</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; P(50),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;31</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; MP(60),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;32</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; MF(70),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;33</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; F(85),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; FF(100),</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;22</td> <td class="src"><pre class="src">&nbsp; FFF(120);</pre></td></tr>
<tr> <td class="numLine">&nbsp;36</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;37</td> <td class="nbHits">&nbsp;</td>
@@ -86,9 +86,9 @@ <h5>Coverage Report - com.myronmarston.music.Dynamic</h5>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> String regexPattern;</pre></td></tr>
<tr> <td class="numLine">&nbsp;39</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;40</td> <td class="nbHitsCovered">&nbsp;168</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> Dynamic(<span class="keyword">int</span> midiVolume) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;41</td> <td class="nbHitsCovered">&nbsp;168</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.midiVolume = midiVolume;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;42</td> <td class="nbHitsCovered">&nbsp;168</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;40</td> <td class="nbHitsCovered">&nbsp;176</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> Dynamic(<span class="keyword">int</span> midiVolume) {</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;41</td> <td class="nbHitsCovered">&nbsp;176</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">this</span>.midiVolume = midiVolume;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;42</td> <td class="nbHitsCovered">&nbsp;176</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;43</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLine">&nbsp;44</td> <td class="nbHits">&nbsp;</td>
@@ -103,7 +103,7 @@ <h5>Coverage Report - com.myronmarston.music.Dynamic</h5>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;49</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getMidiVolume() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;50</td> <td class="nbHitsCovered">&nbsp;246</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;50</td> <td class="nbHitsCovered">&nbsp;260</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
<tr> <td class="numLine">&nbsp;51</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;52</td> <td class="nbHits">&nbsp;</td>
@@ -161,6 +161,6 @@ <h5>Coverage Report - com.myronmarston.music.Dynamic</h5>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/21/08 3:52 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/28/08 6:26 PM.</div>
</body>
</html>
@@ -89,6 +89,6 @@ <h5>Coverage Report - com.myronmarston.music.GermIsEmptyException</h5>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/21/08 3:52 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/28/08 6:26 PM.</div>
</body>
</html>
@@ -95,6 +95,6 @@ <h5>Coverage Report - com.myronmarston.music.IncorrectNoteStringException</h5>
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/21/08 3:52 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/28/08 6:26 PM.</div>
</body>
</html>
Oops, something went wrong.

0 comments on commit 67bde27

Please sign in to comment.