Skip to content

Commit

Permalink
Copy CHANGELOG and LICENSE to JAR file.
Browse files Browse the repository at this point in the history
  • Loading branch information
julian-urbano committed Aug 8, 2016
1 parent 58abf75 commit 9939794
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 25 deletions.
10 changes: 10 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
</dependencies>

<build>
<resources>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>CHANGELOG</include>
<include>LICENSE</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
35 changes: 10 additions & 25 deletions src/jurbano/melodyshape/MelodyShape.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,28 @@

package jurbano.melodyshape;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;

import jurbano.melodyshape.comparison.CachedNGramComparer;
import jurbano.melodyshape.comparison.CombinedNGramComparer;
import jurbano.melodyshape.comparison.EqualPitchNGramComparer;
import jurbano.melodyshape.comparison.FrequencyNGramComparer;
import jurbano.melodyshape.comparison.IntervalPitchNGramComparer;
import jurbano.melodyshape.comparison.MelodyComparer;
import jurbano.melodyshape.comparison.NGramMelodyComparer;
import jurbano.melodyshape.comparison.*;
import jurbano.melodyshape.comparison.alignment.GlobalAligner;
import jurbano.melodyshape.comparison.alignment.HybridAligner;
import jurbano.melodyshape.comparison.alignment.LocalAligner;
import jurbano.melodyshape.comparison.bspline.BSplinePitchNGramComparer;
import jurbano.melodyshape.comparison.bspline.BSplineShapeNGramComparer;
import jurbano.melodyshape.comparison.bspline.BSplineTimeNGramComparer;
import jurbano.melodyshape.model.InMemoryMelodyCollection;
import jurbano.melodyshape.model.Melody;
import jurbano.melodyshape.model.MelodyCollection;
import jurbano.melodyshape.model.MelodyReader;
import jurbano.melodyshape.model.MidiReader;
import jurbano.melodyshape.model.*;
import jurbano.melodyshape.ranking.Result;
import jurbano.melodyshape.ranking.ResultRanker;
import jurbano.melodyshape.ranking.UntieResultRanker;
import jurbano.melodyshape.ui.ConsoleUIObserver;
import jurbano.melodyshape.ui.GraphicalUIObserver;
import jurbano.melodyshape.ui.UIObserver;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.*;

/**
* Main class of the tool. Contains all the logic to read MIDI collections,
* instantiate and run algorithms. Delegates presentation logic in
Expand All @@ -62,7 +47,7 @@ public class MelodyShape
*/
public static String COPYRIGHT_NOTICE ="MelodyShape " + MelodyShape.VERSION
+ " Copyright (C) 2013-2016 Julian Urbano <[email protected]>\n"
+ " This program is distributed under the terms of the MIT License.";
+ "This program is distributed under the terms of the MIT License.";
/**
* The list of algorithms available in the release.
*/
Expand Down

0 comments on commit 9939794

Please sign in to comment.