Updating to latest google caliper code

This commit is contained in:
Mark DePristo 2013-01-07 21:25:44 -05:00
parent b2990497e2
commit 2e5d38fd0e
3 changed files with 9 additions and 7 deletions

View File

@ -82,7 +82,7 @@
<!-- testing and evaluation dependencies --> <!-- testing and evaluation dependencies -->
<dependency org="org.testng" name="testng" rev="5.14.1"/> <dependency org="org.testng" name="testng" rev="5.14.1"/>
<dependency org="org.uncommons" name="reportng" rev="1.1.2"/> <dependency org="org.uncommons" name="reportng" rev="1.1.2"/>
<dependency org="com.google.code.caliper" name="caliper" rev="1.0-SNAPSHOT"/> <dependency org="com.google.caliper" name="caliper" rev="0.5-rc1"/>
<!-- Contracts for Java and dependencies --> <!-- Contracts for Java and dependencies -->
<dependency org="com.google.code.cofoja" name="cofoja" rev="1.0-r139"/> <dependency org="com.google.code.cofoja" name="cofoja" rev="1.0-r139"/>

View File

@ -27,14 +27,14 @@ package org.broadinstitute.sting.utils.fragments;
import com.google.caliper.Param; import com.google.caliper.Param;
import com.google.caliper.SimpleBenchmark; import com.google.caliper.SimpleBenchmark;
import com.google.caliper.runner.CaliperMain;
import net.sf.samtools.SAMFileHeader; import net.sf.samtools.SAMFileHeader;
import org.broadinstitute.sting.utils.GenomeLoc; import org.broadinstitute.sting.utils.GenomeLoc;
import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.sting.utils.GenomeLocParser;
import org.broadinstitute.sting.utils.pileup.ReadBackedPileup; import org.broadinstitute.sting.utils.pileup.ReadBackedPileup;
import org.broadinstitute.sting.utils.sam.ArtificialSAMUtils; import org.broadinstitute.sting.utils.sam.ArtificialSAMUtils;
import java.util.*; import java.util.ArrayList;
import java.util.List;
/** /**
* Caliper microbenchmark of fragment pileup * Caliper microbenchmark of fragment pileup
@ -76,6 +76,6 @@ public class FragmentUtilsBenchmark extends SimpleBenchmark {
} }
public static void main(String[] args) { public static void main(String[] args) {
CaliperMain.main(FragmentUtilsBenchmark.class, args); com.google.caliper.Runner.main(FragmentUtilsBenchmark.class, args);
} }
} }

View File

@ -27,13 +27,15 @@ package org.broadinstitute.variant.variantcontext;
import com.google.caliper.Param; import com.google.caliper.Param;
import com.google.caliper.SimpleBenchmark; import com.google.caliper.SimpleBenchmark;
import com.google.caliper.runner.CaliperMain;
import org.broad.tribble.Feature; import org.broad.tribble.Feature;
import org.broad.tribble.FeatureCodec; import org.broad.tribble.FeatureCodec;
import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.sting.utils.GenomeLocParser;
import org.broadinstitute.variant.vcf.VCFCodec; import org.broadinstitute.variant.vcf.VCFCodec;
import java.util.*; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** /**
* Caliper microbenchmark of parsing a VCF file * Caliper microbenchmark of parsing a VCF file
@ -372,6 +374,6 @@ public class VariantContextBenchmark extends SimpleBenchmark {
// } // }
public static void main(String[] args) { public static void main(String[] args) {
CaliperMain.main(VariantContextBenchmark.class, args); com.google.caliper.Runner.main(VariantContextBenchmark.class, args);
} }
} }