Ver código fonte

Fixing prefixes for type operations.

Lucas Albertins 3 anos atrás
pai
commit
de09a4daf7

+ 1 - 1
tools/typeOperations/src/main/java/ua/be/typeOperations/controllers/CSVController.java

@@ -23,7 +23,7 @@ public class CSVController {
 	public ResponseEntity<String> outliers(@RequestBody OutlierRequest request) {
 		int column = request.getColumn();
 		String iri = request.getIri();
-		String prefix = iri.substring(1,iri.indexOf('#'));
+		String prefix = iri.substring(1,iri.indexOf('#')+1);
     	String instance = iri.substring(iri.indexOf('#')+1, iri.length()-1);
 		String file = request.getFile();
 		String result;

+ 0 - 8
tools/typeOperations/src/main/java/ua/be/typeOperations/model/csv/CSVOperationManager.java

@@ -37,13 +37,5 @@ public class CSVOperationManager {
 		operation = op;
 	}
 	
-	public static void main(String[] args) throws IOException {
-		
-		
-		CSVOperationManager.getInstance().setOperation(new OutlierDetectionOperation(2,"http://ua.be/drivetrain/description/artifacts/artifacts#", "drivetrain-sensor-data"));
-		System.out.println(CSVOperationManager.getInstance().executeCSVOperation(new File("src/main/resources/csv/rotation.csv")));
-	}
-	
-	
 	
 }

+ 2 - 1
tools/typeOperations/src/main/java/ua/be/typeOperations/model/csv/operations/OutlierDetectionOperation.java

@@ -88,7 +88,7 @@ public class OutlierDetectionOperation implements Operation {
 		for (CSVRecord row : list) {
 			double value = Double.parseDouble(row.get(column));
 			if (((value - average)/sd) >= 2 ) {
-				sb.append("<" + artifactPrefix + instanceName + "-cell-" + rowN + "" + column + ">\n");
+				sb.append("<" + artifactPrefix +  instanceName + "-cell-" + rowN + "" + column + ">\n");
 				sb.append("\trdf:type "+ Prefixes.CELL_VOCABULARY_IRI + " , ");
 				sb.append(Prefixes.DATA_VOCABULARY_IRI + " , owl:Thing ;\n");
 				sb.append("\t"+Prefixes.TABULAR_VOCABULARY_IRI+ "hasColumnPosition> " + column + " ;\n");
@@ -102,6 +102,7 @@ public class OutlierDetectionOperation implements Operation {
 			}
 			rowN++;
 		}
+		System.out.println(sb.toString());
 		return sb.toString();
 	}
 

+ 3 - 3
tools/typeOperations/src/main/java/ua/be/typeOperations/model/util/Prefixes.java

@@ -3,11 +3,11 @@ package ua.be.typeOperations.model.util;
 public final class Prefixes {
 
 	
-	public static final String DATA_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/base/file#Data>";
+	public static final String DATA_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/formalism/file#Data>";
 	
-	public static final String CELL_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/base/tabular#Cell>";
+	public static final String CELL_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/formalism/tabular#Cell>";
 	
-	public static final String TABULAR_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/base/tabular#";
+	public static final String TABULAR_VOCABULARY_IRI = "<http://ua.be/sdo2l/vocabulary/formalism/tabular#";
 	
 	
 }