From 30d39ea15065f6f6aee389a368f9ad0b4ec2d0fb Mon Sep 17 00:00:00 2001
From: Guilherme Henrique <guihss.cs@gmail.com>
Date: Mon, 7 Nov 2022 11:51:43 +0100
Subject: [PATCH] changed build
---
build.gradle | 36 +++++++++----------
src/main/{resources => }/META-INF/MANIFEST.MF | 0
.../complex/ComplexAlignmentGeneration.java | 11 +++---
.../java/irit/dataset/DatasetManager.java | 1 +
4 files changed, 24 insertions(+), 24 deletions(-)
rename src/main/{resources => }/META-INF/MANIFEST.MF (100%)
diff --git a/build.gradle b/build.gradle
index 24b9d60..925930a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,45 +5,41 @@
*/
plugins {
+ id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'java'
- id 'maven-publish'
}
+
+group = 'irit'
+version = '0.1.1'
+description = 'CanardE'
+java.sourceCompatibility = JavaVersion.VERSION_18
+
repositories {
mavenLocal()
maven {
url = uri('https://repo.maven.apache.org/maven2/')
}
+ mavenCentral()
}
dependencies {
implementation 'org.deeplearning4j:deeplearning4j-core:1.0.0-M1.1'
implementation 'org.nd4j:nd4j-native-platform:1.0.0-M1.1'
- implementation 'com.fasterxml.jackson.core:jackson-core:2.12.1'
- implementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.1'
- implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.1'
+ implementation 'com.fasterxml.jackson.core:jackson-core:2.13.4'
+ implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.4'
+ implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
implementation 'commons-codec:commons-codec:1.15'
- implementation 'org.slf4j:slf4j-nop:1.7.36'
- implementation 'org.apache.jena:apache-jena-libs:4.4.0'
- implementation 'org.apache.commons:commons-text:1.9'
+ implementation 'org.slf4j:slf4j-nop:2.0.3'
+ // https://mvnrepository.com/artifact/org.apache.jena/apache-jena-libs
+ implementation 'org.apache.jena:apache-jena-libs:4.6.1'
+
+ implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'net.sourceforge.argparse4j:argparse4j:0.9.0'
//https://gitlab.inria.fr/moex/alignapi/-/releases
implementation files('lib/align.jar')
- implementation files('lib/alignsvc.jar')
implementation files('lib/ontowrap.jar')
implementation files('lib/procalign.jar')
}
-group = 'org.example'
-version = '1.0-SNAPSHOT'
-description = 'CanardE'
-java.sourceCompatibility = JavaVersion.VERSION_18
-
-publishing {
- publications {
- maven(MavenPublication) {
- from(components.java)
- }
- }
-}
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/META-INF/MANIFEST.MF
similarity index 100%
rename from src/main/resources/META-INF/MANIFEST.MF
rename to src/main/META-INF/MANIFEST.MF
diff --git a/src/main/java/irit/complex/ComplexAlignmentGeneration.java b/src/main/java/irit/complex/ComplexAlignmentGeneration.java
index 8c7acc0..a993346 100755
--- a/src/main/java/irit/complex/ComplexAlignmentGeneration.java
+++ b/src/main/java/irit/complex/ComplexAlignmentGeneration.java
@@ -18,6 +18,7 @@ import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.Namespace;
+import org.apache.jena.base.Sys;
import org.apache.jena.rdf.model.RDFNode;
import java.io.IOException;
@@ -60,6 +61,8 @@ public class ComplexAlignmentGeneration {
run(sourceName, targetName, sparqlSelects, rangeList, maxMatches, false, output);
+ DatasetManager.getInstance().close();
+
} catch (ArgumentParserException e) {
parser.handleError(e);
}
@@ -96,9 +99,6 @@ public class ComplexAlignmentGeneration {
.setDefault("output")
.help("Output folder.");
- parser.addArgument("--embedding")
- .type(String.class)
- .help("Path to embeddings.");
parser.addArgument("--silent")
.type(Boolean.class)
@@ -130,9 +130,12 @@ public class ComplexAlignmentGeneration {
float end = start;
float step = 0.1f;
+
if (split.length > 1) end = Float.parseFloat(split[1]);
- if (split.length > 2) start = Float.parseFloat(split[2]);
+ if (split.length > 2) step = Float.parseFloat(split[2]);
+ ranges.add(start);
+ start += step;
for (; start < end; start += step) {
ranges.add(start);
}
diff --git a/src/main/java/irit/dataset/DatasetManager.java b/src/main/java/irit/dataset/DatasetManager.java
index b351022..924bfa1 100644
--- a/src/main/java/irit/dataset/DatasetManager.java
+++ b/src/main/java/irit/dataset/DatasetManager.java
@@ -6,6 +6,7 @@ import org.apache.jena.query.DatasetFactory;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
+import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
--
GitLab