diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14_carried_out_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14_carried_out_by.java deleted file mode 100644 index c792a6e..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14_carried_out_by.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.relation; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface P14_carried_out_by { - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15_was_influenced_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15_was_influenced_by.java deleted file mode 100644 index 1f13ae6..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15_was_influenced_by.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.relation; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface P15_was_influenced_by { - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25_is_maintained_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25_is_maintained_by.java index 92520d3..150f25a 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25_is_maintained_by.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25_is_maintained_by.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.P15_was_influenced_by; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25i_maintains.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25i_maintains.java index d511173..c7c64a5 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25i_maintains.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP25i_maintains.java @@ -1,5 +1,7 @@ package org.gcube.informationsystem.parthenos.model.relation; +import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.P15i_influenced; + /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2_provided_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2_provided_by.java deleted file mode 100644 index dad991d..0000000 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2_provided_by.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.gcube.informationsystem.parthenos.model.relation; - - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public interface PP2_provided_by extends P14_carried_out_by { - -} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130_shows_features_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P130_shows_features_of.java similarity index 97% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130_shows_features_of.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P130_shows_features_of.java index eb61528..adb3c55 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130_shows_features_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P130_shows_features_of.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; import org.gcube.informationsystem.model.entity.Resource; import org.gcube.informationsystem.model.relation.IsRelatedTo; diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P14_carried_out_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P14_carried_out_by.java new file mode 100644 index 0000000..40a6706 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P14_carried_out_by.java @@ -0,0 +1,43 @@ +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; + +import org.gcube.informationsystem.model.entity.Resource; +import org.gcube.informationsystem.model.relation.IsRelatedTo; + +/** + * @author Luca Frosini (ISTI - CNR) + * + * P14 carried out by (performed) + * + * Domain: E7 Activity + * Range: E39 Actor + * Subproperty of: E5 Event. P11 had participant (participated in): E39 Actor + * Superproperty of: E8 Acquisition. P22 transferred title to (acquired title + * through): E39 Actor E8 Acquisition. P23 transferred title from + * (surrendered title through): E39 Actor E10 Transfer of Custody. P28 + * custody surrendered by (surrendered custody through): E39 Actor E10 + * Transfer of Custody. P29 custody received by (received custody + * through): E39 Actor + * Quantification: many to many, necessary (1,n:0,n) + * + * Scope note: This + * property describes the active participation of an E39 Actor in an E7 + * Activity. It implies causal or legal responsibility. The P14.1 in the + * role of property of the property allows the nature of an Actor’s + * participation to be specified. + * + * Examples: + *  the painting of the Sistine Chapel (E7) carried out by Michaelangelo + * Buonaroti (E21) in the role of master craftsman (E55) + * + * In First Order Logic: + * P14 (x,y) ⊃ E7(x) + * P14 (x,y)⊃ E39(y) + * P14 (x,y) ⊃ P11(x,y) + * P14(x,y,z) ⊃ [P14(x,y) ∧ E55(z)] + * + * Properties: P14.1 in the role of: E55 Type + */ +public interface P14_carried_out_by + extends IsRelatedTo { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P15_was_influenced_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P15_was_influenced_by.java new file mode 100644 index 0000000..480237c --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/P15_was_influenced_by.java @@ -0,0 +1,33 @@ +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; + +import org.gcube.informationsystem.model.entity.Resource; +import org.gcube.informationsystem.model.relation.IsRelatedTo; + +/** + * @author Luca Frosini (ISTI - CNR) + * Domain: E7 Activity + * Range:E1 CRM Entity + * Superproperty of: E7 Activity. P16 used specific object (was used for): + * E70 Thing E7 Activity. P17 was motivated by (motivated): E1 CRM Entity + * E7 Activity. P134 continued (was continued by): E7 Activity E83 Type + * Creation. P136 was based on (supported type creation): E1 CRM Entity + * + * Quantification: many to many (0,n:0,n) + * + * Scope note: This is a high level property, which captures the relationship + * between an E7 Activity and anything that may have had some bearing upon it. + * The property has more specific sub properties. + * + * Examples: + *  the designing of the Sydney Harbour Bridge (E7) was influenced by the + * Tyne bridge (E22) + * + * In First Order Logic: + * P15 (x,y) ⊃ E7(x) + * P15 (x,y) ⊃ E1(y) + * + */ +public interface P15_was_influenced_by + extends IsRelatedTo { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP17_has_snapshot.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP17_has_snapshot.java index b81a9ed..b7df102 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP17_has_snapshot.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP17_has_snapshot.java @@ -2,7 +2,6 @@ package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; import org.gcube.informationsystem.parthenos.model.entity.resource.PE19_Persistent_Digital_Object; import org.gcube.informationsystem.parthenos.model.entity.resource.PE20_Volatile_Digital_Object; -import org.gcube.informationsystem.parthenos.model.relation.P130_shows_features_of; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP2_provided_by.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP2_provided_by.java new file mode 100644 index 0000000..647eddc --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP2_provided_by.java @@ -0,0 +1,12 @@ +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto; + +import org.gcube.informationsystem.parthenos.model.entity.resource.PE1_Service; +import org.gcube.informationsystem.parthenos.model.entity.resource.cidoc.E39_Actor; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public interface PP2_provided_by + extends P14_carried_out_by { + +} diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130i_features_are_also_found_on.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P130i_features_are_also_found_on.java similarity index 55% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130i_features_are_also_found_on.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P130i_features_are_also_found_on.java index ec76db4..3c53c43 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P130i_features_are_also_found_on.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P130i_features_are_also_found_on.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14i_performed.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P14i_performed.java similarity index 50% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14i_performed.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P14i_performed.java index f5ea505..e195a78 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P14i_performed.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P14i_performed.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15i_influenced.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P15i_influenced.java similarity index 50% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15i_influenced.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P15i_influenced.java index 83503ba..84141e1 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/P15i_influenced.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/P15i_influenced.java @@ -1,4 +1,4 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP17i_is_snapshot_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP17i_is_snapshot_of.java index 1cfd015..d83762b 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP17i_is_snapshot_of.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP17i_is_snapshot_of.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; -import org.gcube.informationsystem.parthenos.model.relation.P130i_features_are_also_found_on; /** diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2i_provides.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP2i_provides.java similarity index 56% rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2i_provides.java rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP2i_provides.java index 282ebe0..4c19711 100644 --- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP2i_provides.java +++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP2i_provides.java @@ -1,4 +1,5 @@ -package org.gcube.informationsystem.parthenos.model.relation; +package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse; + /**