Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
lindenb committed Sep 5, 2023
2 parents 8b89196 + 713d5cf commit 0e664f0
Show file tree
Hide file tree
Showing 14 changed files with 304 additions and 1,411 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2181,15 +2181,15 @@ all2.add(task("ibdreformater01", type: CompileJVarkit) {

all2.add(task("jvarkit", type: CompileJVarkit) {
mainClass = "com.github.lindenb.jvarkit.tools.jvarkit.JvarkitCentral"
otherJavaFiles = [ "**/AlleleFrequencyCalculator.java", "**/AddLinearIndexToBed.java", "**/BarcodeGenerator.java", "**/BamLiftOver.java", "**/BamToHaplotypes.java", "**/BamToSql.java", "**/BedMergeCnv.java", "**/BackLocate.java", "**/Bam2Raster.java","**/BamToMNV.java", "**/BamMatrix.java", "**/Bam2Wig.java", "**/BamPhased01.java", "**/Bam2Xml.java", "**/BamStats04.java", "**/BamStats05.java", "**/BamToSVG.java", "**/BaseCoverage.java", "**/BamWithoutBai.java", "**/BedCluster.java", "**/BedNonOverlappingSet.java", "**/BedRemoveBed.java", "**/BioAlcidaeJdk.java", "**/BioToRDF.java", "**/Biostar103303.java", "**/Biostar105754.java", "**/Biostar130456.java", "**/Biostar139647.java", "**/Biostar145820.java", "**/Biostar154220.java", "**/Biostar165777.java", "**/Biostar170742.java", "**/Biostar172515.java", "**/Biostar173114.java", "**/Biostar175929.java", "**/Biostar178713.java", "**/Biostar9556602.java", "**/Biostar214299.java", "**/Biostar234081.java", "**/Biostar234230.java", "**/Biostar251649.java", "**/Biostar322664.java", "**/Biostar332826.java", "**/Biostar336589.java", "**/Biostar352930.java", "**/Biostar398854.java", "**/Biostar404363.java", "**/Biostar480685.java", "**/Biostar489074.java", "**/Biostar497922.java", "**/Biostar59647.java", "**/Biostar76892.java", "**/Biostar77288.java", "**/Biostar77828.java", "**/Biostar78285.java", "**/Biostar81455.java", "**/Biostar84452.java", "**/Biostar84786.java", "**/Biostar86363.java", "**/Biostar86480.java", "**/Biostar90204.java", "**/Biostar9462889.java", "**/Biostar9469733.java", "**/Biostar9501110.java", "**/Biostar9566948.java", "**/BuildDbsnp.java", "**/CoverageMatrix.java", "**/CoverageServer.java", "**/CnvTView.java", "**/ConvertBamChromosomes.java", "**/ConvertBedChromosomes.java", "**/ConvertVcfChromosomes.java", "**/CoveragePlotter.java","**/ConvertLiftOverChain.java", "**/EVADumpFiles.java", "**/HtsFreemarker.java", "**/IbdToVcf.java", "**/IlluminaDirectory.java","**/FindNewSpliceSites.java", "**/FindAVariation.java", "**/FindAllCoverageAtPosition.java", "**/FindGVCFsBlocks.java", "**/Gff3UpstreamOrf.java","**/Gff3UpstreamOrf.java", "**/GtexRsToQTL.java","**/GoUtils.java", "**/GroupByGene.java", "**/GtfToBed.java", "**/Gtf2Xml.java","**/KnownRetroCopy.java", "**/KnownGeneToFasta.java","**/KgToGff.java","**/KnownGenesToBed.java", "**/LowResBam2Raster.java", "**/MiniCaller.java", "**/MakeMiniBam.java", "**/MantaMerger.java", "**/MsaToVcf.java", "**/NcbiTaxonomyToXml.java", "**/OboUtils.java", "**/PlotSashimi.java", "**/PrettySam.java", "**/Pubmed404.java", "**/PubmedCodingLanguages.java", "**/PubmedGender.java", "**/PubmedDump.java", "**/PubmedGraph.java","**/*.ReferenceToHtml.java", "**/SamplesRDF.java", "**/Sam2Tsv.java", "**/SamViewWithMate.java", "**/SamGrep.java", "**/ScanRetroCopy.java", "**/SortSamRefName.java", "**/SamRemoveDuplicatedNames.java", "**/StarRetroCopy.java", "**/SplitVcf.java", "**/SetFileTools.java", "**/SamToJson.java", "**/SamFindClippedRegions.java", "**/SvToSVG.java", "**/SortVcfOnInfo.java", "**/SwingBamCov.java", "**/SwingBamView.java","**/SwingIndexCov.java", "**/SwingVcfJexlFilter.java", "**/SwingVcfView.java", "**/StructuralVariantToFasta.java", "**/TextBam.java", "**/TViewCmd.java", "**/Vcf2Xml.java", "**/VcfTbiToBed.java", "**/VcfFilterGtf.java", "**/VcfAncestralAllele.java", "**/VcfSpringFilter.java","**/VcfConcat.java", "**/VcfServer.java", "**/VCFFlatten.java", "**/VcfDistanceBetweenVariants.java", "**/VcfAlleleBalance.java", "**/VcfMultiToOne.java", "**/VcfMultiToOneInfo.java", "**/UniprotToSvg.java", "**/UKBiobankSelectSamples.java", "**/VCFSVAnnotator.java", "**/VcfSetSequenceDictionary.java", "**/VcfPeekAf.java", "**/VcfPseudoAutosomalRegion.java", "**/VCFBigWig.java", "**/VCFComposite.java", "**/VcfStrechToSvg.java", "**/VCFShuffle.java", "**/VcfBigBed.java", "**/VcfGatkEval.java", "**/VcfGrantham.java", "**/VcFilterGenes.java", "**/VcfFilterJdk.java", "**/VcfFilterSequenceOntology.java", "**/VCFTrios.java", "**/VcfGeneSplitter.java","**/VcfRegulomeDB.java", "**/VcfGnomad.java", "**/VcfGnomadSV.java", "**/VcfHead.java", "**/VCFPolyX.java", "**/VcfRebase.java", "**/VcfPhased01.java", "**/VcfSplitNVariants.java", "**/VCFCombineTwoSnvs.java", "**/VcfTail.java", "**/VcfToTable.java", "**/VcfCadd.java", "**/VcfSpliceAI.java", "**/VcfBurdenFisherH.java", "**/VcfStats.java", "**/VcfToIntervals.java", "**/VcfBurdenMAF.java", "**/VcfGroupByPopulation.java", "**/CNVValidatorServer.java", "**/VcfScanUpstreamOrf.java","**/WibToBedGraph.java", "**/WesCnvSvg.java", "**/WGSCoveragePlotter.java", "**/XsltStream.java"]
otherJavaFiles = [ "**/AlleleFrequencyCalculator.java", "**/AddLinearIndexToBed.java", "**/BarcodeGenerator.java", "**/BamLiftOver.java", "**/BamToHaplotypes.java", "**/BamToSql.java", "**/BedMergeCnv.java", "**/BackLocate.java", "**/Bam2Raster.java","**/BamToMNV.java", "**/BamMatrix.java", "**/Bam2Wig.java", "**/BamPhased01.java", "**/Bam2Xml.java", "**/BamStats04.java", "**/BamStats05.java", "**/BamToSVG.java", "**/BaseCoverage.java", "**/BamWithoutBai.java", "**/BedCluster.java", "**/BedNonOverlappingSet.java", "**/BedRemoveBed.java", "**/BioAlcidaeJdk.java", "**/BioToRDF.java", "**/Biostar103303.java", "**/Biostar105754.java", "**/Biostar130456.java", "**/Biostar139647.java", "**/Biostar145820.java", "**/Biostar154220.java", "**/Biostar165777.java", "**/Biostar170742.java", "**/Biostar172515.java", "**/Biostar173114.java", "**/Biostar175929.java", "**/Biostar178713.java", "**/Biostar9556602.java", "**/Biostar214299.java", "**/Biostar234081.java", "**/Biostar234230.java", "**/Biostar251649.java", "**/Biostar322664.java", "**/Biostar332826.java", "**/Biostar336589.java", "**/Biostar352930.java", "**/Biostar398854.java", "**/Biostar404363.java", "**/Biostar480685.java", "**/Biostar489074.java", "**/Biostar497922.java", "**/Biostar59647.java", "**/Biostar76892.java", "**/Biostar77288.java", "**/Biostar77828.java", "**/Biostar78285.java", "**/Biostar81455.java", "**/Biostar84452.java", "**/Biostar84786.java", "**/Biostar86363.java", "**/Biostar86480.java", "**/Biostar90204.java", "**/Biostar9462889.java", "**/Biostar9469733.java", "**/Biostar9501110.java", "**/Biostar9566948.java", "**/BuildDbsnp.java", "**/CoverageMatrix.java", "**/CoverageServer.java", "**/CnvTView.java", "**/ConvertBamChromosomes.java", "**/ConvertBedChromosomes.java", "**/ConvertVcfChromosomes.java", "**/CoveragePlotter.java","**/ConvertLiftOverChain.java", "**/EVADumpFiles.java", "**/HtsFreemarker.java", "**/IbdToVcf.java", "**/IlluminaDirectory.java","**/FindNewSpliceSites.java", "**/FindAVariation.java", "**/FindAllCoverageAtPosition.java", "**/FindGVCFsBlocks.java", "**/Gff3UpstreamOrf.java","**/Gff3UpstreamOrf.java", "**/GtexRsToQTL.java","**/GoUtils.java", "**/GroupByGene.java", "**/GtfToBed.java", "**/Gtf2Xml.java","**/KnownRetroCopy.java", "**/KnownGeneToFasta.java","**/KgToGff.java","**/KnownGenesToBed.java", "**/LowResBam2Raster.java", "**/MiniCaller.java", "**/MakeMiniBam.java", "**/MantaMerger.java", "**/MsaToVcf.java", "**/NcbiTaxonomyToXml.java", "**/OboUtils.java", "**/PlotSashimi.java", "**/PrettySam.java", "**/Pubmed404.java", "**/PubmedCodingLanguages.java", "**/PubmedGender.java", "**/PubmedDump.java", "**/PubmedGraph.java", "**/RDFCombine.java", "**/ReferenceToHtml.java", "**/Sam2Tsv.java", "**/SamViewWithMate.java", "**/SamGrep.java", "**/ScanRetroCopy.java", "**/SortSamRefName.java", "**/SamRemoveDuplicatedNames.java", "**/StarRetroCopy.java", "**/SplitVcf.java", "**/SetFileTools.java", "**/SamToJson.java", "**/SamFindClippedRegions.java", "**/SvToSVG.java", "**/SortVcfOnInfo.java", "**/SwingBamCov.java", "**/SwingBamView.java","**/SwingIndexCov.java", "**/SwingVcfJexlFilter.java", "**/SwingVcfView.java", "**/StructuralVariantToFasta.java", "**/TextBam.java", "**/TViewCmd.java", "**/Vcf2Xml.java", "**/VcfTbiToBed.java", "**/VcfFilterGtf.java", "**/VcfAncestralAllele.java", "**/VcfSpringFilter.java","**/VcfConcat.java", "**/VcfServer.java", "**/VCFFlatten.java", "**/VcfDistanceBetweenVariants.java", "**/VcfAlleleBalance.java", "**/VcfMultiToOne.java", "**/VcfMultiToOneInfo.java", "**/UniprotToSvg.java", "**/UKBiobankSelectSamples.java", "**/VCFSVAnnotator.java", "**/VcfSetSequenceDictionary.java", "**/VcfPeekAf.java", "**/VcfPseudoAutosomalRegion.java", "**/VCFBigWig.java", "**/VCFComposite.java", "**/VcfStrechToSvg.java", "**/VCFShuffle.java", "**/VcfBigBed.java", "**/VcfGatkEval.java", "**/VcfGrantham.java", "**/VcFilterGenes.java", "**/VcfFilterJdk.java", "**/VcfFilterSequenceOntology.java", "**/VCFTrios.java", "**/VcfGeneSplitter.java","**/VcfRegulomeDB.java", "**/VcfGnomad.java", "**/VcfGnomadSV.java", "**/VcfHead.java", "**/VCFPolyX.java", "**/VcfRebase.java", "**/VcfPhased01.java", "**/VcfSplitNVariants.java", "**/VCFCombineTwoSnvs.java", "**/VcfTail.java", "**/VcfToTable.java", "**/VcfCadd.java", "**/VcfSpliceAI.java", "**/VcfBurdenFisherH.java", "**/VcfStats.java", "**/VcfToIntervals.java", "**/VcfBurdenMAF.java", "**/VcfGroupByPopulation.java", "**/CNVValidatorServer.java", "**/VcfScanUpstreamOrf.java","**/WibToBedGraph.java", "**/WesCnvSvg.java", "**/WGSCoveragePlotter.java", "**/XsltStream.java"]
jarLibs = combineLibs("htsjdk","testng","jcommander","math","jetty","httpclient","jena","gson", "springcontext","freemarker")
});



all2.add(task("jeter", type: CompileJVarkit) {
mainClass = "com.github.lindenb.jvarkit.tools.upstreamorf.Gff3UpstreamOrf"
jarLibs = combineLibs("htsjdk","testng","jcommander")
mainClass = "com.github.lindenb.jvarkit.tools.rdfcombine.RDFCombine"
jarLibs = combineLibs("htsjdk","testng","jcommander","jena")
});


Expand Down
2 changes: 0 additions & 2 deletions docs/JvarkitCentral.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ JVARKIT
=======

Author : Pierre Lindenbaum Phd. Institut du Thorax. Nantes. France.
Version : 2bbae3cc2
Compilation : 20230829095306
Github : https://github.com/lindenb/jvarkit
Issues : https://github.com/lindenb/jvarkit/issues

Expand Down
104 changes: 104 additions & 0 deletions docs/RDFCombine.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# RDFCombine

![Last commit](https://img.shields.io/github/last-commit/lindenb/jvarkit.png)

Substract/Add RDF models


## Usage


This program is now part of the main `jvarkit` tool. See [jvarkit](JvarkitCentral.md) for compiling.


```
Usage: java -jar dist/jvarkit.jar rdfcombine [options] Files
Usage: rdfcombine [options] Files
Options:
--base
(URI) xml:base when reading rdf model from stdin or writing model
Default: <empty string>
-h, --help
print help and exit
--helpFormat
What kind of help. One of [usage,markdown,xml].
--keep-rdfType
ignore rdf:type in minus model. (do not remove rdf:type in source)
Default: false
-o, --output
Output file. Optional . Default: stdout
--output-format
Write a serialized represention of a model in a specified language.
Predefined values are RDF/XML, RDF/XML-ABBREV, N-TRIPLE, TURTLE, (and
TTL) and N3
Default: RDF/XML-ABBREV
--version
print version and exit
```


## Creation Date

20230903

## Source code

[https://github.com/lindenb/jvarkit/tree/master/src/main/java/com/github/lindenb/jvarkit/tools/rdfcombine/RDFCombine.java](https://github.com/lindenb/jvarkit/tree/master/src/main/java/com/github/lindenb/jvarkit/tools/rdfcombine/RDFCombine.java)


## Contribute

- Issue Tracker: [http://github.com/lindenb/jvarkit/issues](http://github.com/lindenb/jvarkit/issues)
- Source Code: [http://github.com/lindenb/jvarkit](http://github.com/lindenb/jvarkit)

## License

The project is licensed under the MIT license.

## Citing

Should you cite **rdfcombine** ? [https://github.com/mr-c/shouldacite/blob/master/should-I-cite-this-software.md](https://github.com/mr-c/shouldacite/blob/master/should-I-cite-this-software.md)

The current reference is:

[http://dx.doi.org/10.6084/m9.figshare.1425030](http://dx.doi.org/10.6084/m9.figshare.1425030)

> Lindenbaum, Pierre (2015): JVarkit: java-based utilities for Bioinformatics. figshare.
> [http://dx.doi.org/10.6084/m9.figshare.1425030](http://dx.doi.org/10.6084/m9.figshare.1425030)

## Input

input is a list of URI, or a file with the '.list' suffix containing the URI

URI are processed sequentially.

URI can be prefixed with '+' or '-' . A minus sign means that the model will be substracted to the current one.

WARNING: blank nodes are always not equal

## Example

```
$ java -jar dist/jvarkit.jar rdfcombine ${HOME}/file.rdf -${HOME}/file.rdf
[INFO][RDFCombine]number of statements after adding file.rdf) = 1663
[INFO][RDFCombine]number of statements after substracting -file.rdf) = 0
<rdf:RDF
xmlns:rel="http://purl.org/vocab/relationship/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:bio="http://purl.org/vocab/bio/0.1/"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
</rdf:RDF>
$ java -jar dist/jvarkit.jar rdfcombine ${HOME}/file2.rdf ${HOME}/file2.rdf
java -jar dist/jvarkit.jar rdfcombine "https://raw.githubusercontent.com/BruceMWhealton/Gedcom-RDF/master/Disney.rdf" "https://raw.githubusercontent.com/BruceMWhealton/Gedcom-RDF/master/Thomas.rdf"
```


7 changes: 7 additions & 0 deletions docs/ReferenceToHtml.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,10 @@ The current reference is:
> [http://dx.doi.org/10.6084/m9.figshare.1425030](http://dx.doi.org/10.6084/m9.figshare.1425030)

## Example

```
$ java -jar dist/jvarkit.jar ref2html -o TMP --regions "RF02:1-500" -R src/test/resources/rotavirus_rf.fa src/test/resources/rotavirus_rf.vcf.gz
```


Loading

0 comments on commit 0e664f0

Please sign in to comment.