Skip to content

Commit

Permalink
Added code to throw proper exceptions when a 17th voice is created, o…
Browse files Browse the repository at this point in the history 
…r a fractal piece is generated without any voices or sections. Also changed the way the track channel numbering works so that the first track uses channel 0.
  • Loading branch information
@myronmarston
myronmarston committed Jun 10, 2008
1 parent 676e6d3 commit 5f45e83
Show file tree
Hide file tree
Showing 70 changed files with 2,075 additions and 2,070 deletions.
42 changes: 21 additions & 21 deletions FractalComposer/build/cobertura-report/com.myronmarston.music.Dynamic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;138</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;42</td> <td class="src"><pre class="src">&nbsp; PPP(10),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; PP(25),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;30</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; P(50),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;31</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; MP(60),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;32</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; MF(70),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;33</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; F(85),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; FF(100),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;42</td> <td class="src"><pre class="src">&nbsp; FFF(120);</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;147</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;24</td> <td class="src"><pre class="src">&nbsp; PPP(10),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; PP(25),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;30</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; P(50),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;31</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; MP(60),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;32</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; MF(70),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;33</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; F(85),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;24</td> <td class="src"><pre class="src">&nbsp; FF(100),</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;24</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>
Expand All @@ -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;336</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;336</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;336</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;40</td> <td class="nbHitsCovered">&nbsp;192</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;192</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;192</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>
Expand All @@ -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;490</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;621</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>
Expand All @@ -120,21 +120,21 @@ <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;58</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> String getDynamicExampleString() {</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;59</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; StringBuilder str = <span class="keyword">new</span> StringBuilder();</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;60</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; Dynamic[] values = Dynamic.values(); <span class="comment">// cache the array...</span></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;59</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; StringBuilder str = <span class="keyword">new</span> StringBuilder();</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;60</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; Dynamic[] values = Dynamic.values(); <span class="comment">// cache the array...</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;61</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;62</td> <td class="nbHitsCovered"><a title="Line 62: Conditional coverage 100% (2/2).">&nbsp;18</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 62: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i &lt; values.length; i++) {</a></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;63</td> <td class="nbHitsCovered">&nbsp;16</td> <td class="src"><pre class="src">&nbsp; str.append(values[i].toString()); </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;62</td> <td class="nbHitsCovered"><a title="Line 62: Conditional coverage 100% (2/2).">&nbsp;9</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 62: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i &lt; values.length; i++) {</a></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;63</td> <td class="nbHitsCovered">&nbsp;8</td> <td class="src"><pre class="src">&nbsp; str.append(values[i].toString()); </pre></td></tr>
<tr> <td class="numLine">&nbsp;64</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;65</td> <td class="nbHitsCovered"><a title="Line 65: Conditional coverage 100% (2/2).">&nbsp;16</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 65: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == values.length - 2) str.append(<span class="string">" or "</span>); </a></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;66</td> <td class="nbHitsCovered"><a title="Line 66: Conditional coverage 100% (2/2).">&nbsp;14</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 66: Conditional coverage 100% (2/2)."> <span class="keyword">else</span> <span class="keyword">if</span> (i &lt; values.length - 2) str.append(<span class="string">", "</span>); </a></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;65</td> <td class="nbHitsCovered"><a title="Line 65: Conditional coverage 100% (2/2).">&nbsp;8</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 65: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == values.length - 2) str.append(<span class="string">" or "</span>); </a></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;66</td> <td class="nbHitsCovered"><a title="Line 66: Conditional coverage 100% (2/2).">&nbsp;7</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 66: Conditional coverage 100% (2/2)."> <span class="keyword">else</span> <span class="keyword">if</span> (i &lt; values.length - 2) str.append(<span class="string">", "</span>); </a></pre></td></tr>
<tr> <td class="numLine">&nbsp;67</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;68</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;69</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> str.toString(); </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;69</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> str.toString(); </pre></td></tr>
<tr> <td class="numLine">&nbsp;70</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;71</td> <td class="nbHits">&nbsp;</td>
Expand All @@ -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/10/08 5:04 PM.</div>
<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/10/08 10:44 PM.</div>
</body>
</html>
6 changes: 3 additions & 3 deletions FractalComposer/build/cobertura-report/com.myronmarston.music.GermIsEmptyException.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ <h5>Coverage Report - com.myronmarston.music.GermIsEmptyException</h5>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;33</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> GermIsEmptyException() {</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(<span class="string">"The germ is empty. A midi sequence cannot be created without it."</span>);</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;34</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(<span class="string">"The germ is empty. A midi sequence cannot be created without it."</span>);</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;35</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; }</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>
</table>

<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/10/08 5:04 PM.</div>
<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/10/08 10:44 PM.</div>
</body>
</html>
6 changes: 3 additions & 3 deletions ...lComposer/build/cobertura-report/com.myronmarston.music.IncorrectNoteStringException.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ <h5>Coverage Report - com.myronmarston.music.IncorrectNoteStringException</h5>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;36</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> IncorrectNoteStringException(String noteString) {</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;37</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(noteString, String.format(<span class="string">"Error: the note string '%s' was entered incorrectly and could not be parsed."</span>, noteString));</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;38</td> <td class="nbHitsCovered">&nbsp;2</td> <td class="src"><pre class="src">&nbsp; } </pre></td></tr>
<tr> <td class="numLineCover">&nbsp;37</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">super</span>(noteString, String.format(<span class="string">"Error: the note string '%s' was entered incorrectly and could not be parsed."</span>, noteString));</pre></td></tr>
<tr> <td class="numLineCover">&nbsp;38</td> <td class="nbHitsCovered">&nbsp;1</td> <td class="src"><pre class="src">&nbsp; } </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>
</table>

<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/10/08 5:04 PM.</div>
<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 6/10/08 10:44 PM.</div>
</body>
</html>
Loading

0 comments on commit 5f45e83

Please sign in to comment.