package org.simantics.db.common.request;
-import java.util.Collections;
-
import org.simantics.db.ReadGraph;
import org.simantics.db.Resource;
-import org.simantics.db.common.utils.CommonDBUtils;
+import org.simantics.db.common.utils.NearestOwnerFinder;
import org.simantics.db.exception.DatabaseException;
-import org.simantics.layer0.Layer0;
public class PossibleOwner extends ResourceRead<Resource> {
@Override
public Resource perform(ReadGraph graph) throws DatabaseException {
- Layer0 L0 = Layer0.getInstance(graph);
- Resource directOwner = graph.getPossibleObject(resource, L0.IsOwnedBy);
- if(directOwner != null) return directOwner;
- return CommonDBUtils.getNearestOwner(graph, Collections.singleton(resource));
+ return NearestOwnerFinder.getNearestOwner(graph, resource);
}
}
\ No newline at end of file
return owners;
}
+ /**
+ * This method didn't have a clear specification and therefore should not be used. Use instead
+ * the methods in the class {@link NearestOwnerFinder}.
+ */
+ @Deprecated
public static Resource getNearestOwner(ReadGraph graph, Collection<Resource> resources) throws DatabaseException {
- return getNearestOwner(graph, resources, null);
- }
-
- private static Resource getNearestOwner(ReadGraph graph, Collection<Resource> resources, THashSet<Resource> infiniteRecursionBreaker) throws DatabaseException {
-
- Layer0 L0 = Layer0.getInstance(graph);
-
- // These are resources that are linked to some of the input resources by IsComposedOf
- Set<Resource> directOwners = new HashSet<Resource>();
-
- // These are resources that refer to some of the input resources which don't have an owner
- Set<Resource> referringResources = new HashSet<Resource>();
-
- for(Resource r : resources) {
-
- Collection<Resource> owners = graph.getObjects(r, L0.IsOwnedBy);
-
- // TODO: getObjects returns duplicate entries (https://www.simantics.org/redmine/issues/4885) and therefore direct is Set<Resource>. Fix getObjects to not return duplicate entries
- if (owners.size() > 1) {
- owners = new HashSet<Resource>(owners);
- if (owners.size() > 1) {
- LOGGER.error("Multiple owners for {}, id: {}", graph.getPossibleURI(r), r);
- for (Resource r2 : owners)
- LOGGER.error(" owner: {}, id: {}", graph.getPossibleURI(r2), r2);
- return null;
- }
- }
-
- if (owners.isEmpty()) {
- // If there are no owners, collect resources referring to this resource by IsRelatedTo
- for(Statement stm : graph.getStatements(r, L0.IsWeaklyRelatedTo)) {
- Resource inverse = graph.getPossibleInverse(stm.getPredicate());
- if(inverse != null) {
- if(graph.isSubrelationOf(inverse, L0.IsRelatedTo)) {
- // Filter away tags
- if(r.equals(stm.getObject()))
- continue;
- referringResources.add(stm.getObject());
- }
- }
- }
- }
- else
- directOwners.addAll(owners);
- }
-
- if(!directOwners.isEmpty()) {
- Iterator<Resource> iter = directOwners.iterator();
- Resource common = iter.next();
- while (iter.hasNext()) {
- Resource other = iter.next();
- common = commonAncestor(graph, common, other);
- if (common == null)
- return null; // The
- }
- referringResources.add(common);
- }
- if(referringResources.isEmpty())
- return null;
-
- if(!Collections.disjoint(referringResources, resources)) {
- LOGGER.error("Overlapping owners:");
- for(Resource r : resources)
- LOGGER.error(" resource {}", NameUtils.getSafeName(graph, r, true));
- for(Resource r : referringResources)
- LOGGER.error(" owner {}", NameUtils.getSafeName(graph, r, true));
- return null;
- }
-
- if(referringResources.size() == 1)
- return referringResources.iterator().next();
-
- // Prevent recursion on current input resources
- if(infiniteRecursionBreaker == null)
- infiniteRecursionBreaker = new THashSet<>(resources);
- else {
- if(!Collections.disjoint(infiniteRecursionBreaker, resources)) {
- infiniteRecursionBreaker.retainAll(resources);
- LOGGER.error("Resources have a cyclic reference loop preventing the discovery their owner. {}", infiniteRecursionBreaker);
- return null;
- }
-
- infiniteRecursionBreaker.addAll(resources);
- }
-
- return getNearestOwner(graph, referringResources, infiniteRecursionBreaker);
-
+ if(resources.size() == 1)
+ return NearestOwnerFinder.getNearestOwner(graph, resources.iterator().next());
+ else
+ return NearestOwnerFinder.getNearestOwnerFromDirectOwners(graph, resources);
}
public static Resource getClusterSetForNewResource(ReadGraph graph, Resource ... resources) throws DatabaseException {
if(resources.length == 1) return getClusterSetForNewResource(graph, resources[0]);
- Resource owner = getNearestOwner(graph, CollectionUtils.toList(resources));
+ Resource owner = NearestOwnerFinder.getNearestOwnerFromDirectOwners(graph, CollectionUtils.toList(resources));
if(owner == null) return null;
return getClusterSetForNewResource(graph, owner, new HashSet<Resource>());
if(resources.size() == 1) return getClusterSetForNewResource(graph, resources.iterator().next());
- Resource owner = getNearestOwner(graph, resources);
+ Resource owner = NearestOwnerFinder.getNearestOwnerFromDirectOwners(graph, resources);
return getClusterSetForNewResource(graph, owner, new HashSet<Resource>());
}
--- /dev/null
+package org.simantics.db.common.utils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.Statement;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.THashSet;
+
+/**
+ * <p>A utility to finds the nearest owner of a real or imaginary resource.</p>
+ *
+ * <p>The nearest owner
+ * is found by first finding a path (pilot path) from the input to a root resource and then
+ * trying to find other paths to the resources in the pilot path such that the other
+ * paths don't visit other resources of the pilot path. The farthest resource so found
+ * is then the nearest common owner. See the methods for the exact specification.</p>
+ *
+ * <p>The time and space complexity of the algorithm is O(m),
+ * where m is the number of resources reachable by direct-owners relation from the input.</p>
+ *
+ * @see {@link #getNearestOwner(ReadGraph, Resource)}
+ * @see {@link #getNearestOwner(ReadGraph, Collection)}</p>
+ *
+ */
+public class NearestOwnerFinder {
+ private static final int FIRST_DISTANCE = 1;
+ private static final int UNVISITED = 0;
+ private static final int NOT_INTERESTING_ANYMORE = -1;
+
+ private final ReadGraph graph;
+ private final Layer0 L0;
+
+ private final TObjectIntHashMap<Resource> resourceStatus = new TObjectIntHashMap<>();
+
+ private int nearestOwnerDistance; // = 0
+ private Resource nearestOwner; // = null
+
+ private NearestOwnerFinder(ReadGraph graph, Layer0 L0) {
+ this.graph = graph;
+ this.L0 = L0;
+ }
+
+ /**
+ * Iterates the owners of the input resource. It first
+ * tries to find the pilot path and when it has been found,
+ * it browses other owners with {@link #browseNonpilot}.
+ */
+ private void browseOwnersOfInput(Collection<Resource> owners) throws DatabaseException {
+ Iterator<Resource> it = owners.iterator();
+ while(it.hasNext()) {
+ Resource owner = it.next();
+ if(browsePilot(owner, FIRST_DISTANCE)) {
+ // Because we found a path to root, {@code owner}
+ // becomes our first candidate for nearestOwner.
+ nearestOwner = owner;
+ nearestOwnerDistance = FIRST_DISTANCE;
+
+ // Tries to find other paths to the resource in the pilot path.
+ while(it.hasNext())
+ browseNonpilot(it.next());
+ return;
+ }
+ }
+ }
+
+ /**
+ * Tries to find a first path (=pilot path) to a root with DFS.
+ */
+ private boolean browsePilot(Resource resource, int distance) throws DatabaseException {
+ if(resourceStatus.putIfAbsent(resource, distance) != UNVISITED)
+ // We recursed back to the current path or encountered previously failed path.
+ return false;
+
+ Collection<Resource> owners = getDirectOwners(graph, L0, resource);
+ if(owners.isEmpty())
+ // We found a root
+ return true;
+
+ for(Resource owner : owners)
+ if(browsePilot(owner, distance+1)) {
+ // We found a path to a root
+ return true;
+ }
+
+ // Failed to find a path to a root
+ resourceStatus.put(resource, NOT_INTERESTING_ANYMORE);
+ return false;
+ }
+
+ /**
+ * Tries to find some path to a resource on a pilot path using DFS.
+ * Marks all visited resource by {@code NOT_INTERESTING_ANYMORE}
+ * to prevent visiting the same resources more than once.
+ */
+ private void browseNonpilot(Resource resource) throws DatabaseException {
+ // In the next statement, we may overwrite also information about resource being on pilot path,
+ // but that is ok, because we don't care resources that are nearer than nearestOwnerDistance.
+ int status = resourceStatus.put(resource, NOT_INTERESTING_ANYMORE);
+ if(status == UNVISITED) {
+ Collection<Resource> owners = getDirectOwners(graph, L0, resource);
+ if(owners.isEmpty()) {
+ // This is a root that differs from the root at the end of the pilot path.
+ // Therefore there cannot be a nearest owner.
+ nearestOwnerDistance = Integer.MAX_VALUE;
+ nearestOwner = null;
+ return;
+ }
+ for(Resource owner : owners)
+ browseNonpilot(owner);
+ }
+ else if(status > nearestOwnerDistance) {
+ nearestOwnerDistance = status;
+ nearestOwner = resource;
+ }
+ }
+
+ private static Collection<Resource> getDirectOwners(ReadGraph graph, Layer0 L0, Resource resource) throws DatabaseException {
+ Collection<Resource> owners = graph.getObjects(resource, L0.IsOwnedBy);
+ if(owners.isEmpty()) {
+ if(resource.equals(graph.getRootLibrary()))
+ return Collections.emptyList();
+
+ owners = new THashSet<Resource>();
+
+ // If there are no owners, collect resources referring to this resource by IsRelatedTo
+ for(Statement statement : graph.getStatements(resource, L0.IsWeaklyRelatedTo)) {
+ Resource inverse = graph.getPossibleInverse(statement.getPredicate());
+ if(inverse != null) {
+ if(graph.isSubrelationOf(inverse, L0.IsRelatedTo)) {
+ // Filter away tags
+ if(resource.equals(statement.getObject()))
+ continue;
+ owners.add(statement.getObject());
+ }
+ }
+ }
+ }
+ else if(owners.size() > 1) {
+ // TODO: getObjects returns duplicate entries (https://www.simantics.org/redmine/issues/4885) and therefore direct is Set<Resource>.
+ // Fix getObjects to not return duplicate entries
+ owners = new HashSet<Resource>(owners);
+ }
+
+ return owners;
+ }
+
+ /**
+ * <p>Finds the nearest owner of a resource. Nearest owner is the
+ * <a href="https://en.wikipedia.org/wiki/Dominator_(graph_theory)">immediate dominator</a>
+ * of the resource in a graph defined in the following way:
+ * Each IsComposedOf statement is an edge of the graph.
+ * Additionally an IsRelatedTo statement in an edge of graph if
+ * no IsComposedOf statement points to its object.</p>
+ *
+ * <p>The root of the graph is any resource without owners or the root resource
+ * of the database. If the search encounters two distinct roots, there
+ * cannot be a nearest owner.</p>
+ *
+ * @return The nearest owner or {@code null} if no roots or more than one roots are found.
+ */
+ public static Resource getNearestOwner(ReadGraph graph, Resource resource) throws DatabaseException {
+ // Handle cases of one or zero direct owners
+ Layer0 L0 = Layer0.getInstance(graph);
+ Collection<Resource> owners = getDirectOwners(graph, L0, resource);
+ if(owners.size() == 1)
+ return owners.iterator().next();
+ if(owners.isEmpty())
+ return null;
+
+ // There are two or more direct owners
+ NearestOwnerFinder finder = new NearestOwnerFinder(graph, L0);
+ finder.resourceStatus.put(resource, NOT_INTERESTING_ANYMORE);
+ finder.browseOwnersOfInput(owners);
+ return finder.nearestOwner;
+ }
+
+ /**
+ * <p>Finds the nearest owner of a real or imaginary resource whose direct owners are known. This works in the same
+ * way as the method for one resource {@link #getNearestOwner(ReadGraph, Resource)}
+ * but we add one extra node to the graph that has the input resources as direct owners and
+ * find the immediate dominator of that extra node.</p>
+ *
+ * <p>Note that this method may return one of the input resources if it is dominator of all other
+ * resources in the collection. Returns {@code null} if the input collection is empty.</p>
+ */
+ public static Resource getNearestOwnerFromDirectOwners(ReadGraph graph, Collection<Resource> owners) throws DatabaseException {
+ // Handle the cases of one or zero direct owners
+ if(owners.size() == 1)
+ return owners.iterator().next();
+ if(owners.isEmpty())
+ return null;
+
+ // There are two or more direct owners
+ Layer0 L0 = Layer0.getInstance(graph);
+ NearestOwnerFinder finder = new NearestOwnerFinder(graph, L0);
+ finder.browseOwnersOfInput(owners);
+ return finder.nearestOwner;
+ }
+}
import org.simantics.db.common.utils.ListUtils;
import org.simantics.db.common.utils.Logger;
import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.common.utils.NearestOwnerFinder;
import org.simantics.db.common.validation.L0Validations;
import org.simantics.db.exception.AdaptionException;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.exception.DoesNotContainValueException;
import org.simantics.db.exception.NoSingleResultException;
import org.simantics.db.exception.RuntimeDatabaseException;
-import org.simantics.db.exception.VariableException;
import org.simantics.db.layer0.exception.InvalidVariableException;
import org.simantics.db.layer0.exception.MissingVariableException;
import org.simantics.db.layer0.exception.MissingVariableValueException;
ClusteringSupport cs = graph.getService(ClusteringSupport.class);
if(cs.isClusterSet(resource) && !base.equals(resource)) return resource;
- Resource nearest = CommonDBUtils.getNearestOwner(graph, Collections.singletonList(resource));
+ Resource nearest = NearestOwnerFinder.getNearestOwner(graph, resource);
if(nearest == null) return null;
return getPossibleNearestClusterSet(graph, base, nearest);
combo.addListener(SWT.Traverse, listener);
}
- protected void editUnit(Table table, TableEditor editor, final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem, int column) {
+ public void editUnit(Table table, TableEditor editor, final ComponentTypeViewerPropertyInfo propertyInfo, TableItem selectedItem, int column) {
// Disallow unit editing for non-numeric configuration properties
if (propertyInfo.numberType == null && propertyInfo.sectionSpecificData == null)
return;
import org.simantics.databoard.type.NumberType;
import org.simantics.db.Resource;
import org.simantics.utils.strings.AlphanumComparator;
+import org.simantics.utils.strings.StringUtils;
public class ComponentTypeViewerPropertyInfo implements Comparable<ComponentTypeViewerPropertyInfo> {
public Resource resource;
return false;
return true;
}
-
-
+
+ public String unitString() {
+ String result = numberType == null ? null : numberType.getUnit();
+ if (result == null)
+ result = unit;
+ return StringUtils.safeString(result);
+ }
+
+ public String rangeString() {
+ return StringUtils.safeString(numberType == null ? null : numberType.getRangeStr());
+ }
+
}
\ No newline at end of file
item.setText(0, info.name);
item.setText(1, info.type);
item.setText(2, info.defaultValue);
- item.setText(3, unitStr(info));
- item.setText(4, rangeStr(info));
+ item.setText(3, info.unitString());
+ item.setText(4, info.rangeString());
item.setText(5, info.label);
item.setText(6, info.description);
}
}
- private String unitStr(ComponentTypeViewerPropertyInfo info) {
- String unit = info.numberType == null ? null : info.numberType.getUnit();
- if (unit == null)
- unit = info.unit;
- return unit != null ? unit : "";
- }
-
- private String rangeStr(ComponentTypeViewerPropertyInfo info) {
- String range = info.numberType == null ? null : info.numberType.getRangeStr();
- return range != null ? range : "";
- }
-
@Override
public void setReadOnly(boolean readOnly) {
boolean e = !readOnly;
public class DerivedPropertiesSection implements ComponentTypeViewerSection {
private static final String[] COLUMN_NAMES =
- new String[] {"Name", "Type", "Expression", "Label", "Description"};
+ new String[] {"Name", "Type", "Expression", "Unit", "Label", "Description"};
private static final int[] COLUMN_LENGTHS =
- new int[] { 120, 100, 100, 100, 100 };
+ new int[] { 120, 100, 100, 70, 100, 100 };
private static final int[] COLUMN_WEIGHTS =
- new int[] { 0, 0, 100, 0, 0 };
+ new int[] { 0, 0, 100, 0, 0, 0 };
private static Function4<RequestProcessor, Resource, Resource, String, String> VALIDATE_MONITOR_EXPRESSION =
new Function4<RequestProcessor, Resource, Resource, String, String>() {
@Override
}, VALIDATE_MONITOR_EXPRESSION);
break;
-// case 3:
-// editUnit(table2, editor2, propertyInfo, selectedItem, column);
-// break;
-
case 3:
+ data.editUnit(table, editor, propertyInfo, selectedItem, column);
+ break;
+
+ case 4:
data.editValue(table, editor, propertyInfo, selectedItem, column, propertyInfo.immutable ? null : new StringWriter() {
@Override
public void perform(WriteGraph graph, String newValue) throws DatabaseException {
}, null);
break;
- case 4:
+ case 5:
data.editMultilineText(table, editor, propertyInfo, selectedItem, selectedItemBounds, column, new StringWriter() {
@Override
public void perform(WriteGraph graph, String newValue) throws DatabaseException {
item.setText(0, info.valid != null ? info.name + " (!)" : info.name);
item.setText(1, info.type);
item.setText(2, info.expression);
- //item.setText(3, unitStr(info));
- item.setText(3, info.label);
- item.setText(4, info.description);
+ item.setText(3, info.unitString());
+ item.setText(4, info.label);
+ item.setText(5, info.description);
item.setForeground(fg);
return 100.0;
}
-}
+}
\ No newline at end of file
*******************************************************************************/
package org.simantics.modeling.userComponent;
-import gnu.trove.map.hash.THashMap;
-
import java.util.Map;
import org.simantics.databoard.Bindings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import gnu.trove.map.hash.THashMap;
+
public class ComponentTypeCommands {
private static final Logger LOGGER = LoggerFactory.getLogger(ComponentTypeCommands.class);
return;
}
- Datatype dt = graph.getDataType(object);
- if (dt instanceof NumberType) {
- NumberType nt = (NumberType) dt;
- Binding ntb = Bindings.getBindingUnchecked(Datatype.class);
- nt.setUnit(unit);
+ Layer0X L0X = Layer0X.getInstance(graph);
+ boolean hasRequiresDataType = graph.hasStatement(relation, L0X.RequiresDataType);
+ if (hasRequiresDataType) {
+ Datatype dt = graph.getDataType(object);
+ if (dt instanceof NumberType) {
+ Layer0 L0 = Layer0.getInstance(graph);
+ NumberType nt = (NumberType) Bindings.DATATYPE.cloneUnchecked(dt);
+ nt.setUnit(unit);
+ graph.claimLiteral(object, L0.HasDataType, L0.DataType, nt, Bindings.DATATYPE);
+ graph.claimLiteral(relation, L0X.RequiresDataType, L0.DataType, nt, Bindings.DATATYPE);
+ }
+ }
- Layer0 L0 = Layer0.getInstance(graph);
- Layer0X L0X = Layer0X.getInstance(graph);
-
- String oldUnit = graph.getPossibleRelatedValue2(relation, L0X.HasUnit, Bindings.STRING);
+ String oldUnit = graph.getPossibleRelatedValue2(relation, L0X.HasUnit, Bindings.STRING);
+ graph.claimLiteral(relation, L0X.HasUnit, unit, Bindings.STRING);
- graph.claimLiteral(object, L0.HasDataType, L0.DataType, nt, ntb);
- graph.claimLiteral(relation, L0X.RequiresDataType, L0.DataType, nt, ntb);
- graph.claimLiteral(relation, L0X.HasUnit, unit, Bindings.STRING);
-
- CommentMetadata cm = graph.getMetadata(CommentMetadata.class);
- graph.addMetadata(cm.add("Setted unit from " + oldUnit + " to " + unit + " for component/annotation " + type));
- }
+ CommentMetadata cm = graph.getMetadata(CommentMetadata.class);
+ graph.addMetadata(cm.add("Set unit from " + oldUnit + " to " + unit + " for component/annotation " + type + " property " + relation));
}
/**
b.append('_').append((int)c).append('_');
}
//System.out.println("m2c " + moduleName + " -> " + b.toString());
- return b.toString().replace("..", "._.");
+ return b.toString().replace("..", "._.").replace("//", "/_/");
}
public static String classNameToModuleName(String className) {
- className = className.replace("._.", "..");
+ className = className.replace("/_/", "//").replace("._.", "..");
StringBuilder b = new StringBuilder(className.length());
int length = className.length();
for(int i=0;i<length;++i) {
import org.simantics.db.common.request.TransientUnaryRead;
import org.simantics.db.common.utils.CommonDBUtils;
import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.common.utils.NearestOwnerFinder;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.exception.NoSingleResultException;
import org.simantics.db.layer0.exception.MissingVariableException;
for (Resource composite : graph.getObjects(join, STR.JoinsComposite))
ancestorGenerators.add(composite);
}
- Resource ancestor = ancestorGenerators.size() == 1 ? ancestorGenerators.iterator().next() : CommonDBUtils.getNearestOwner(graph, ancestorGenerators);
+ Resource ancestor = ancestorGenerators.size() == 1 ? ancestorGenerators.iterator().next() : NearestOwnerFinder.getNearestOwnerFromDirectOwners(graph, ancestorGenerators);
List<Resource> result = colls.createList();
result.add(ancestor);
Code Review / simantics / platform.git / commitdiff