From 94a80aa0cba58f2c38a9ced09d1a879989df4b33 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Mon, 13 Nov 2023 21:13:25 +0100 Subject: [PATCH 001/179] prepare for release 4.1.0 --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dfa54924..333f1a66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,8 +23,8 @@ plugins { eclipse } dependencies { - implementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED") - implementation("org.modelingvalue:mvg-json:4.0.0-BRANCHED") + implementation("org.modelingvalue:immutable-collections:4.1.0-BRANCHED") + implementation("org.modelingvalue:mvg-json:4.1.0-BRANCHED") } publishing { publications { diff --git a/gradle.properties b/gradle.properties index 3f2a56ce..47258904 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ # suppress inspection "UnusedProperty" for whole file group = org.modelingvalue artifact = dclare -version = 4.0.0 +version = 4.1.0 version_java = 17 From dd1db3e4d2848c531b4ca916b34a9456b83eb95b Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 23 Nov 2023 12:21:29 +0100 Subject: [PATCH 002/179] trace too many changes readability improvement --- src/main/java/org/modelingvalue/dclare/ObserverTrace.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index cd74335e..6bc27788 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -134,9 +134,11 @@ private void trace(C context, BiConsumer runHandler, TriCo } private void traceBack(C context, BiConsumer runHandler, TriConsumer readHandler, TriConsumer writeHandler, Function traceHandler, Set[] done, int length) { + for (Entry w : written) { + writeHandler.accept(context, this, w.getKey()); + } for (Entry> e : backTrace()) { if (!e.getValue().isEmpty()) { - writeHandler.accept(context, this, e.getKey()); readHandler.accept(context, this, e.getKey()); for (ObserverTrace writer : e.getValue()) { writer.trace(traceHandler.apply(context), runHandler, readHandler, writeHandler, traceHandler, done, length); From 210a287921d299a16f68ac46bbb65274da5b4a66 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 24 Nov 2023 17:12:34 +0100 Subject: [PATCH 003/179] raw --- .../dclare/ActionTransaction.java | 2 +- .../java/org/modelingvalue/dclare/IState.java | 4 + .../dclare/IdentityDerivationTransaction.java | 2 +- .../dclare/ImperativeTransaction.java | 1 + .../modelingvalue/dclare/LeafTransaction.java | 8 +- .../org/modelingvalue/dclare/MatchInfo.java | 2 +- .../org/modelingvalue/dclare/Mutable.java | 2 +- .../modelingvalue/dclare/MutableState.java | 10 +++ .../modelingvalue/dclare/ObserverTrace.java | 8 +- .../dclare/ObserverTransaction.java | 80 ++++++++++--------- .../dclare/ReadOnlyTransaction.java | 1 - .../org/modelingvalue/dclare/Setable.java | 2 +- .../java/org/modelingvalue/dclare/State.java | 22 +++-- 13 files changed, 87 insertions(+), 57 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 5c21fdb6..0b9b814f 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -61,7 +61,7 @@ protected final State run(State pre) { run(pre, universeTransaction()); if (universeTransaction().getConfig().isTraceActions()) { postState = currentState.merge(); - Map>> diff = preState.diff(postState, o -> o instanceof Mutable, s -> s instanceof Observed /* && !s.isPlumbing() */).asMap(e -> e); + Map>> diff = preState.diff(postState, o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).asMap(e -> e); if (!diff.isEmpty()) { runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (" + postState.shortDiffString(diff, mutable()) + ")")); } diff --git a/src/main/java/org/modelingvalue/dclare/IState.java b/src/main/java/org/modelingvalue/dclare/IState.java index 04f986bb..19273c36 100644 --- a/src/main/java/org/modelingvalue/dclare/IState.java +++ b/src/main/java/org/modelingvalue/dclare/IState.java @@ -37,4 +37,8 @@ public interface IState { Priority priority(Queued queued); + T getRaw(O object, Getable property); + + IState raw(); + } diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 22adfcaa..713d3dd7 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -55,7 +55,7 @@ protected T getNonDerived(O object, Getable getable) { } private boolean isChanged(O object, Getable getable) { - T pre = universeTransaction().preStartState(Priority.OUTER).get(object, getable); + T pre = universeTransaction().preStartState(Priority.OUTER).getRaw(object, getable); T post = universeTransaction().startState(Priority.OUTER).get(object, getable); return !Objects.equals(pre, post); } diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index f730cdcf..1b896da7 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -246,4 +246,5 @@ public Direction direction() { protected String getCurrentTypeForTrace() { return "IM"; } + } diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index adc6ed1d..a271a358 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -102,6 +102,10 @@ public T get(O object, Getable property) { return state().get(object, property); } + public T getRaw(O object, Getable property) { + return state().getRaw(object, property); + } + protected T current(O object, Getable property) { return current().get(object, property); } @@ -202,11 +206,11 @@ public O directConstruct(Construction.Reason reason, Supplie public abstract Direction direction(); - public MutableState preStartState(Priority priority) { + public IState preStartState(Priority priority) { return universeTransaction().preStartState(priority); } - public MutableState startState(Priority priority) { + public IState startState(Priority priority) { return universeTransaction().startState(priority); } diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 842e9e8e..fa628833 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -41,7 +41,7 @@ private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Obse this.newable = newable; ConstantState constants = otx.universeTransaction().tmpConstants(); removed = otx.startState(Priority.three).get(newable, Mutable.D_PARENT_CONTAINING) == null && // - otx.preStartState(Priority.OUTER).get(newable, Mutable.D_PARENT_CONTAINING) != null; + otx.preStartState(Priority.OUTER).getRaw(newable, Mutable.D_PARENT_CONTAINING) != null; initialConstruction = newable.dInitialConstruction(); allDerivations = newable.dAllDerivations(); identity = constants.get(otx, newable, Newable.D_IDENTITY, n -> { diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 4e1377c2..f4ef930f 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -83,7 +83,7 @@ default QualifiedSet dAllDerivations() { default boolean dBecameOrphan() { LeafTransaction tx = LeafTransaction.getCurrent(); - return tx.preStartState(Priority.OUTER).get(this, Mutable.D_PARENT_CONTAINING) != null && // + return tx.preStartState(Priority.OUTER).getRaw(this, Mutable.D_PARENT_CONTAINING) != null && // tx.state().get(this, Mutable.D_PARENT_CONTAINING) == null; } diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index b47c8ace..3bdd1f54 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -163,4 +163,14 @@ public Priority priority(Queued queued) { return state().priority(queued); } + @Override + public T getRaw(O object, Getable property) { + return state().getRaw(object, property); + } + + @Override + public IState raw() { + return state().raw(); + } + } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 6bc27788..848edd52 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -138,11 +138,9 @@ private void traceBack(C context, BiConsumer runHandler, T writeHandler.accept(context, this, w.getKey()); } for (Entry> e : backTrace()) { - if (!e.getValue().isEmpty()) { - readHandler.accept(context, this, e.getKey()); - for (ObserverTrace writer : e.getValue()) { - writer.trace(traceHandler.apply(context), runHandler, readHandler, writeHandler, traceHandler, done, length); - } + readHandler.accept(context, this, e.getKey()); + for (ObserverTrace writer : e.getValue()) { + writer.trace(traceHandler.apply(context), runHandler, readHandler, writeHandler, traceHandler, done, length); } } } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 00219d54..b58ecc4e 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -36,7 +36,6 @@ public class ObserverTransaction extends ActionTransaction { private static final Set FALSE = Set.of(); private static final Set TRUE = Set.of(true); public static final Context OBSERVE = Context.of(true); - public static final Context RIPPLE_OUT = Context.of(false); @SuppressWarnings("rawtypes") private final Concurrent>> observeds = Concurrent.of(); @@ -401,51 +400,55 @@ private Map actualize(Map map) { @SuppressWarnings("unchecked") private T rippleOut(O object, Observed observed, T pre, T post) { - return RIPPLE_OUT.get(true, () -> { - boolean forward = isForward(object, observed, pre, post); - boolean isNew = !startState(Priority.four).get(mutable(), Mutable.D_OBSERVERS).contains(observer()); - if (isNonMapCollection(pre) && isNonMapCollection(post)) { - ContainingCollection[] result = new ContainingCollection[]{(ContainingCollection) post}; - Observed> many = (Observed>) observed; - Setable. diff(pre, post, added -> { - Priority delay = added(object, many, added, forward, isNew); - if (delay != null) { - defer.set(delay, TRUE); - result[0] = result[0].remove(added); - } - }, removed -> { - Priority delay = removed(object, many, removed, forward, isNew); - if (delay != null) { - defer.set(delay, TRUE); - if (pre instanceof List && post instanceof List) { - int i = Math.min(((List) pre).firstIndexOf(removed), result[0].size()); - result[0] = ((List) result[0]).insert(i, removed); - } else { - result[0] = result[0].add(removed); - } - } - }); - if (!Objects.equals(post, result[0])) { - traceRippleOut(object, observed, post, result[0]); + boolean forward = isForward(object, observed, pre, post); + boolean isNew = !startState(Priority.four).get(mutable(), Mutable.D_OBSERVERS).contains(observer()); + boolean isColl = isNonMapCollection(pre) && isNonMapCollection(post); + boolean isList = isColl && isList(pre) && isList(post); + if (isColl) { + ContainingCollection[] result = new ContainingCollection[]{(ContainingCollection) post}; + Observed> many = (Observed>) observed; + Setable. diff(pre, post, added -> { + Priority delay = added(object, many, added, forward, isNew); + if (delay != null) { + defer.set(delay, TRUE); + result[0] = result[0].remove(added); } - return (T) result[0]; - } else { - Priority delay = changed(object, observed, pre, post, forward, isNew); + }, removed -> { + Priority delay = removed(object, many, removed, forward, isNew); if (delay != null) { defer.set(delay, TRUE); - traceRippleOut(object, observed, post, pre); - return pre; - } else { - return post; + if (pre instanceof List && post instanceof List) { + int i = Math.min(((List) pre).firstIndexOf(removed), result[0].size()); + result[0] = ((List) result[0]).insert(i, removed); + } else { + result[0] = result[0].add(removed); + } } + }); + if (!Objects.equals(post, result[0])) { + traceRippleOut(object, observed, post, result[0]); + return (T) result[0]; + } + } + if (!isColl || isList) { + Priority delay = changed(object, observed, pre, post, forward, isNew); + if (delay != null) { + defer.set(delay, TRUE); + traceRippleOut(object, observed, post, pre); + return pre; } - }); + } + return post; } private boolean isNonMapCollection(T t) { return t instanceof ContainingCollection && !(t instanceof Map) && !(t instanceof DefaultMap); } + private boolean isList(T t) { + return t instanceof List; + } + @SuppressWarnings({"rawtypes", "unchecked"}) private boolean isForward(O outObject, Observed outObserved, T pre, T post) { Mutable mutable = mutable(); @@ -486,14 +489,14 @@ private , E> Priority added(O object, Obser return added(object, observed, startState(Priority.two), state(), added, forward) ? Priority.two : // becameDerived(observed, added, startState(Priority.three), current()) ? Priority.three : // (isNew && added(object, observed, startState(), startState(Priority.four), added, forward)) ? Priority.four : // - added(object, observed, preStartState(Priority.five), startState(Priority.five), added, forward) ? Priority.five : null; + added(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), added, forward) ? Priority.five : null; } private , E> Priority removed(O object, Observed observed, E removed, boolean forward, boolean isNew) { return removed(object, observed, startState(Priority.two), state(), removed, forward) ? Priority.two : // (isNew && removed(object, observed, startState(), startState(Priority.four), removed, forward)) ? Priority.four : // becameContained(observed, removed, startState(Priority.four), startState(Priority.two)) ? Priority.four : // - removed(object, observed, preStartState(Priority.five), startState(Priority.five), removed, forward) ? Priority.five : null; + removed(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), removed, forward) ? Priority.five : null; } private Priority changed(O object, Observed observed, T pre, T post, boolean forward, boolean isNew) { @@ -501,7 +504,7 @@ private Priority changed(O object, Observed observed, T pre, T post becameDerived(observed, post, startState(Priority.three), current()) ? Priority.three : // (isNew && changed(object, observed, startState(), startState(Priority.four), pre, post, forward)) ? Priority.four : // becameContained(observed, pre, startState(Priority.four), startState(Priority.two)) ? Priority.four : // - changed(object, observed, preStartState(Priority.five), startState(Priority.five), pre, post, forward) ? Priority.five : null; + changed(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), pre, post, forward) ? Priority.five : null; } private , E> boolean added(O object, Observed observed, IState preState, IState postState, E added, boolean forward) { @@ -691,4 +694,5 @@ private void replace(MatchInfo replaced, MatchInfo replacing) { protected String getCurrentTypeForTrace() { return "OB"; } + } diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index e9a40420..66dfd1e8 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -107,7 +107,6 @@ public Direction direction() { return Direction.DEFAULT; } - @Override protected String getCurrentTypeForTrace() { return "RO"; diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index b8f49280..bfcb3a95 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -215,7 +215,7 @@ protected final void changed(LeafTransaction tx, O object, T preValue, T postVal } if (containment) { Setable. diff(preValue, postValue, added -> { - Pair> prePair = tx.get(added, Mutable.D_PARENT_CONTAINING); + Pair> prePair = tx.getRaw(added, Mutable.D_PARENT_CONTAINING); if (prePair != null) { MOVING.run(true, () -> prePair.b().remove(prePair.a(), added)); } diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 9c27e778..a152e886 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -60,15 +60,15 @@ protected State(UniverseTransaction universeTransaction, StateMap stateMap) { } } - private State(UniverseTransaction universeTransaction, DefaultMap> map, Queued>[] actions, Queued[] children) { + protected State(UniverseTransaction universeTransaction, DefaultMap> map, Queued>[] actions, Queued[] children) { super(map); this.universeTransaction = universeTransaction; this.actions = actions; this.children = children; } - private State newState(DefaultMap> newMap) { - return newMap.isEmpty() ? universeTransaction.emptyState() : new State(universeTransaction, newMap, actions, children); + protected State newState(DefaultMap> newMap, Queued>[] actions, Queued[] children) { + return new State(universeTransaction, newMap, actions, children); } @Override @@ -116,7 +116,7 @@ public State exchange(Priority prio1, Priority prio2) { children[prio1.ordinal()] = c2; actions[prio2.ordinal()] = a1; children[prio2.ordinal()] = c1; - return new State(universeTransaction, map(), actions, children); + return newState(map(), actions, children); } public State set(O object, Setable property, T value) { @@ -161,7 +161,7 @@ public State set(O object, Setable property, UnaryOperator fu } State set(O object, DefaultMap post) { - return newState(post.isEmpty() ? map().removeKey(object) : map().put(object, post)); + return newState(post.isEmpty() ? map().removeKey(object) : map().put(object, post), actions, children); } @SuppressWarnings("unchecked") @@ -201,7 +201,7 @@ public State merge(StateMergeHandler changeHandler, State[] branches, int length } } return props; - }, maps, maps.length)); + }, maps, maps.length), actions, children); } @Override @@ -384,4 +384,14 @@ public TransactionId transactionId() { return get(universeTransaction.universe(), Mutable.D_CHANGE_ID); } + @Override + public T getRaw(O object, Getable property) { + return get(object, property); + } + + @Override + public IState raw() { + return getClass() == State.class ? this : new State(universeTransaction, map(), actions, children); + } + } From 5cc9408ad74f5bf870a277f5e7cf0997299a44a5 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 27 Nov 2023 10:29:02 +0100 Subject: [PATCH 004/179] prevent trigger when no change --- .../java/org/modelingvalue/dclare/ActionTransaction.java | 8 ++++---- src/main/java/org/modelingvalue/dclare/ConstantState.java | 5 +++-- .../java/org/modelingvalue/dclare/LeafTransaction.java | 4 ++-- .../org/modelingvalue/dclare/ObserverTransaction.java | 4 ++-- .../org/modelingvalue/dclare/ReadOnlyTransaction.java | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 0b9b814f..335ebc28 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -147,7 +147,7 @@ protected void set(O object, Setable property, T pre, T post) { } return po; }, post, oldNew))) { - changed(object, property, oldNew[0], oldNew[1]); + changed(object, property, pre, oldNew[0], oldNew[1]); } } @@ -157,12 +157,12 @@ protected void setState(State state) { @SuppressWarnings({"rawtypes", "unchecked", "RedundantSuppression"}) @Override - protected void changed(O object, Setable setable, T preValue, T postValue) { - super.changed(object, setable, preValue, postValue); + protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + super.changed(object, setable, preValue, rawPreValue, postValue); if (setable.preserved()) { setChanged(object, setable, postValue); } - if (setable instanceof Observed) { + if (setable instanceof Observed && !Objects.equals(preValue, postValue)) { trigger(object, (Observed) setable); } } diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 86655a22..c7d680fe 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -218,8 +218,9 @@ private V set(LeafTransaction tx, O object, Constant constant, Map T pre(O object, Getable property) { return universeTransaction().preState().get(object, property); } - protected void changed(O object, Setable setable, T preValue, T postValue) { - setable.changed(this, object, preValue, postValue); + protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + setable.changed(this, object, rawPreValue, postValue); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index b58ecc4e..2246b862 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -335,11 +335,11 @@ public T getNonObserving(Supplier action) { @SuppressWarnings({"rawtypes", "unchecked", "RedundantSuppression"}) @Override - protected void changed(O object, Setable setable, T preValue, T postValue) { + protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { if (observing(object, setable)) { changed.set(TRUE); } - runNonObserving(() -> super.changed(object, setable, preValue, postValue)); + runNonObserving(() -> super.changed(object, setable, preValue, rawPreValue, postValue)); } private boolean observing(O object, Getable setable) { diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 66dfd1e8..5dd49bf8 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -61,10 +61,10 @@ public State state() { } @Override - protected void changed(O object, Setable property, T preValue, T postValue) { + protected void changed(O object, Setable property, T preValue, T rawPreValue, T postValue) { if (property instanceof Constant) { if (property.isHandlingChange()) { - universeTransaction().put(new Object(), () -> super.changed(object, property, preValue, postValue)); + universeTransaction().put(new Object(), () -> super.changed(object, property, preValue, rawPreValue, postValue)); } } else { throw new UnsupportedOperationException(); From b50e163d89665357de7bdbc9be554d0dedc1392f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 03:21:08 +0000 Subject: [PATCH 005/179] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8d695821..d766c58b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: zulu From 3b453720784360d7fc5b1cded973200815abec08 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 4 Dec 2023 09:12:54 +0100 Subject: [PATCH 006/179] ripple out cleaner --- .../modelingvalue/dclare/ObserverTransaction.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 2246b862..664efaa4 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -400,10 +400,10 @@ private Map actualize(Map map) { @SuppressWarnings("unchecked") private T rippleOut(O object, Observed observed, T pre, T post) { - boolean forward = isForward(object, observed, pre, post); - boolean isNew = !startState(Priority.four).get(mutable(), Mutable.D_OBSERVERS).contains(observer()); boolean isColl = isNonMapCollection(pre) && isNonMapCollection(post); boolean isList = isColl && isList(pre) && isList(post); + boolean forward = isForward(object, observed, pre, post, isColl); + boolean isNew = !startState(Priority.four).get(mutable(), Mutable.D_OBSERVERS).contains(observer()); if (isColl) { ContainingCollection[] result = new ContainingCollection[]{(ContainingCollection) post}; Observed> many = (Observed>) observed; @@ -417,7 +417,7 @@ Setable. diff(pre, post, added -> { Priority delay = removed(object, many, removed, forward, isNew); if (delay != null) { defer.set(delay, TRUE); - if (pre instanceof List && post instanceof List) { + if (isList) { int i = Math.min(((List) pre).firstIndexOf(removed), result[0].size()); result[0] = ((List) result[0]).insert(i, removed); } else { @@ -450,15 +450,13 @@ private boolean isList(T t) { } @SuppressWarnings({"rawtypes", "unchecked"}) - private boolean isForward(O outObject, Observed outObserved, T pre, T post) { + private boolean isForward(O outObject, Observed outObserved, T pre, T post, boolean isColl) { Mutable mutable = mutable(); Pair> intermediatePair = startState(Priority.INNER).get(mutable, Mutable.D_PARENT_CONTAINING); if (!Objects.equals(preStartState(Priority.INNER).get(mutable, Mutable.D_PARENT_CONTAINING), intermediatePair) || !Objects.equals(intermediatePair, state().get(mutable, Mutable.D_PARENT_CONTAINING))) { return true; } else { - boolean handlingContainingCollections = pre instanceof ContainingCollection && post instanceof ContainingCollection; Boolean[] match = new Boolean[]{null}; - return observeds.get().anyMatch(e -> e.getValue().anyMatch(o -> { Observed inObserved = e.getKey(); if (!inObserved.isPlumbing()) { @@ -466,7 +464,7 @@ private boolean isForward(O outObject, Observed outObserved, T p if (!inObject.equals(outObject) || !inObserved.equals(outObserved)) { Object intermediateObject = startState(Priority.INNER).get(inObject, inObserved); return !Objects.equals(preStartState(Priority.INNER).get(inObject, inObserved), intermediateObject) || !Objects.equals(intermediateObject, state().get(inObject, inObserved)); - } else if (handlingContainingCollections) { + } else if (isColl) { if (match[0] == null) { match[0] = isChanged(outObject, outObserved, (ContainingCollection) pre, (ContainingCollection) post, preStartState(Priority.INNER), startState(Priority.INNER)) // || isChanged(outObject, outObserved, (ContainingCollection) pre, (ContainingCollection) post, startState(Priority.INNER), state()); From decd1a17d03432cd092cc482962f79907b523bde Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 5 Dec 2023 12:38:45 +0100 Subject: [PATCH 007/179] debug tracing too many changes fixes --- .../dclare/NonCheckingObserver.java | 5 +- .../dclare/ObserverTransaction.java | 42 ++-- .../dclare/UniverseStatistics.java | 184 ++++++++---------- .../dclare/UniverseTransaction.java | 6 +- 4 files changed, 113 insertions(+), 124 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 1df38b01..28a7f7a9 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -68,13 +68,12 @@ protected void checkTooManyObserved(Mutable mutable, DefaultMap> observeds) { - return 0; + protected void checkTooManyChanges(State pre, DefaultMap> observeds) { } @SuppressWarnings("rawtypes") @Override - protected void trace(State pre, DefaultMap> observeds, int changes) { + protected void trace(State pre, DefaultMap> observeds) { } } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 664efaa4..74a05188 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -46,6 +46,8 @@ public class ObserverTransaction extends ActionTransaction { private final Concurrents> defer = new Concurrents<>(Priority.two); private Pair throwable; + private int nrOfChanges; + private int totalNrOfChanges; protected ObserverTransaction(UniverseTransaction universeTransaction) { super(universeTransaction); @@ -121,6 +123,8 @@ protected final void run(State pre, UniverseTransaction universeTransaction) { constructions.clear(); emptyMandatory.clear(); throwable = null; + nrOfChanges = 0; + totalNrOfChanges = 0; } } } @@ -136,9 +140,8 @@ private void finish(State pre, Observer observer) { try { DefaultMap> observeds = this.observeds.get(); checkTooManyObserved(mutable, observeds); - int nrOfChanges = 0; if (!observer.atomic() && changed.get().equals(TRUE)) { - nrOfChanges = checkTooManyChanges(pre, observeds); + checkTooManyChanges(pre, observeds); trigger(mutable, (Observer) observer, Priority.one); } else { Priority def = defer.first(TRUE::equals); @@ -146,11 +149,11 @@ private void finish(State pre, Observer observer) { rollback(observer.atomic()); trigger(mutable, (Observer) observer, def); } else if (changed.get().equals(TRUE)) { - nrOfChanges = checkTooManyChanges(pre, observeds); + checkTooManyChanges(pre, observeds); trigger(mutable, (Observer) observer, Priority.one); } } - trace(pre, observeds, nrOfChanges); + trace(pre, observeds); DefaultMap preSources = super.set(mutable, observer.observeds(), observeds); if (preSources.isEmpty() && !observeds.isEmpty()) { observer.addInstance(); @@ -180,19 +183,13 @@ protected void checkTooManyObserved(Mutable mutable, DefaultMap> observeds) { + protected void checkTooManyChanges(State pre, DefaultMap> observeds) { UniverseStatistics stats = universeTransaction().stats(); - int totalChanges = stats.bumpAndGetTotalChanges(); - int changesPerInstance = observer().countChangesPerInstance(); - if (stats.maxTotalNrOfChanges() < totalChanges) { + totalNrOfChanges = stats.bumpAndGetTotalChanges(); + nrOfChanges = observer().countChangesPerInstance(); + if (stats.tooManyChangesPerInstance(nrOfChanges, observer(), mutable()) || stats.maxTotalNrOfChanges() < totalNrOfChanges) { stats.setDebugging(true); - return totalChanges; } - if (stats.tooManyChangesPerInstance(changesPerInstance, observer(), mutable())) { - stats.setDebugging(true); - return changesPerInstance; - } - return 0; } @Override @@ -201,21 +198,26 @@ protected void bumpTotalChanges() { } @SuppressWarnings({"rawtypes"}) - protected void trace(State pre, DefaultMap> observeds, int changes) { + protected void trace(State pre, DefaultMap> observeds) { if (observer().isTracing()) { - trace(pre, observeds, changes, observer().traces()); + trace(pre, observeds, observer().traces(), nrOfChanges); } UniverseStatistics stats = universeTransaction().stats(); if (stats.debugging() && changed.get().equals(TRUE)) { - ObserverTrace trace = trace(pre, observeds, changes, observer().debugs()); - if (trace.done().size() > stats.maxNrOfChanges() || changes > stats.maxTotalNrOfChanges() + stats.maxNrOfChanges() * 2) { - throw new TooManyChangesException(current(), trace, changes); + int maxNrOfChanges = stats.maxNrOfChanges(); + ObserverTrace trace = trace(pre, observeds, observer().debugs(), nrOfChanges > maxNrOfChanges ? nrOfChanges : totalNrOfChanges); + if (nrOfChanges > maxNrOfChanges + Math.min(maxNrOfChanges, 32)) { + throw new TooManyChangesException(current(), trace, nrOfChanges); + } + int maxTotalNrOfChanges = stats.maxTotalNrOfChanges(); + if (totalNrOfChanges > maxTotalNrOfChanges + Math.min(maxTotalNrOfChanges, 128)) { + throw new TooManyChangesException(current(), trace, totalNrOfChanges); } } } @SuppressWarnings({"rawtypes", "unchecked"}) - private ObserverTrace trace(State pre, DefaultMap> observeds, int changes, Setable> setable) { + private ObserverTrace trace(State pre, DefaultMap> observeds, Setable> setable, int changes) { List traces = setable.get(mutable()); ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), changes, // observeds.filter(e -> !e.getKey().isPlumbing()).flatMap(e -> e.getValue().map(m -> { diff --git a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java index 31c915e7..770ea6ea 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java @@ -15,14 +15,14 @@ package org.modelingvalue.dclare; -import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.*; +import java.util.Objects; -import java.util.*; +import org.modelingvalue.collections.DefaultMap; +import org.modelingvalue.collections.Set; @SuppressWarnings({"unused", "rawtypes"}) public class UniverseStatistics { - private final UniverseTransaction tx; + private final UniverseTransaction tx; private boolean debugging; private long runCount; @@ -46,8 +46,8 @@ public static class ChampionObserver { public final DefaultMap> observers; public ChampionObserver(Observed observed, Mutable mutable, DefaultMap> observers) { - this.observed = observed; - this.mutable = mutable; + this.observed = observed; + this.mutable = mutable; this.observers = observers; } @@ -80,8 +80,8 @@ public static class ChampionObserved { public final DefaultMap> observeds; public ChampionObserved(Observer observer, Mutable mutable, DefaultMap> observeds) { - this.observer = observer; - this.mutable = mutable; + this.observer = observer; + this.mutable = mutable; this.observeds = observeds; } @@ -114,7 +114,7 @@ public static class ChampionChangesPerInstance { public ChampionChangesPerInstance(Observer observer, Mutable mutable) { this.observer = observer; - this.mutable = mutable; + this.mutable = mutable; } @Override @@ -146,19 +146,19 @@ public UniverseStatistics(UniverseTransaction tx) { public UniverseStatistics(UniverseStatistics o) { this(o.tx); - this.debugging = o.debugging; - this.runCount = o.runCount; - this.forwardCount = o.forwardCount; - this.totalChanges = o.totalChanges; - this.totalChangesEver = o.totalChangesEver; - this.mostTotalChangesEver = o.mostTotalChangesEver; - this.mostObservers = o.mostObservers; - this.mostObserversEver = o.mostObserversEver; - this.championObservers = o.championObservers; - this.mostObserved = o.mostObserved; - this.mostObservedEver = o.mostObservedEver; - this.championObserved = o.championObserved; - this.mostChangesPerInstance = o.mostChangesPerInstance; + this.debugging = o.debugging; + this.runCount = o.runCount; + this.forwardCount = o.forwardCount; + this.totalChanges = o.totalChanges; + this.totalChangesEver = o.totalChangesEver; + this.mostTotalChangesEver = o.mostTotalChangesEver; + this.mostObservers = o.mostObservers; + this.mostObserversEver = o.mostObserversEver; + this.championObservers = o.championObservers; + this.mostObserved = o.mostObserved; + this.mostObservedEver = o.mostObservedEver; + this.championObserved = o.championObserved; + this.mostChangesPerInstance = o.mostChangesPerInstance; this.mostChangesPerInstanceEver = o.mostChangesPerInstanceEver; this.championChangesPerInstance = o.championChangesPerInstance; } @@ -189,9 +189,9 @@ void completeRun() { mostChangesPerInstance = 0; totalChangesEver += totChan; - mostTotalChangesEver = Math.max(mostTotalChangesEver, totChan); - mostObserversEver = Math.max(mostObserversEver, mostObs); - mostObservedEver = Math.max(mostObservedEver, mostObd); + mostTotalChangesEver = Math.max(mostTotalChangesEver, totChan); + mostObserversEver = Math.max(mostObserversEver, mostObs); + mostObservedEver = Math.max(mostObservedEver, mostObd); mostChangesPerInstanceEver = Math.max(mostChangesPerInstanceEver, mostChpi); } @@ -232,17 +232,14 @@ public int bumpAndGetTotalChanges() { } public int totalChanges() { - tx.throwIfError(); return totalChanges; } public long totalChangesEver() { - tx.throwIfError(); return totalChangesEver; } public long mostTotalChangesEver() { - tx.throwIfError(); return mostTotalChangesEver; } @@ -257,14 +254,14 @@ public boolean tooManyChangesPerInstance(int n, Observer observer, Mutable mu } if (n <= maxNrOfChanges()) { if (mostChangesPerInstance < n) { - mostChangesPerInstance = n; + mostChangesPerInstance = n; championChangesPerInstance = new ChampionChangesPerInstance(observer, mutable); } return false; } synchronized (tx) { if (mostChangesPerInstance < n) { - mostChangesPerInstance = n; + mostChangesPerInstance = n; championChangesPerInstance = new ChampionChangesPerInstance(observer, mutable); } } @@ -272,17 +269,14 @@ public boolean tooManyChangesPerInstance(int n, Observer observer, Mutable mu } public int mostChangesPerInstance() { - tx.throwIfError(); return mostChangesPerInstance; } public long mostChangesPerInstanceEver() { - tx.throwIfError(); return mostChangesPerInstanceEver; } public ChampionChangesPerInstance championChangesPerInstance() { - tx.throwIfError(); return championChangesPerInstance; } @@ -291,21 +285,21 @@ public int maxNrOfObservers() { return tx.getConfig().getMaxNrOfObservers(); } - public boolean tooManyObservers(Observed observed, Object /*always Mutable*/ o, DefaultMap> observers) { + public boolean tooManyObservers(Observed observed, Object /* always Mutable */ o, DefaultMap> observers) { if (!devMode()) { return false; } int n = LeafTransaction.sizeForConsistency(observers); if (n <= maxNrOfObservers()) { if (mostObservers < n) { - mostObservers = n; + mostObservers = n; championObservers = new ChampionObserver(observed, o instanceof Mutable ? (Mutable) o : null, observers); } return false; } synchronized (tx) { if (mostObservers < n) { - mostObservers = n; + mostObservers = n; championObservers = new ChampionObserver(observed, o instanceof Mutable ? (Mutable) o : null, observers); } } @@ -313,17 +307,14 @@ public boolean tooManyObservers(Observed observed, Object /*always Mutable*/ o, } public int mostObservers() { - tx.throwIfError(); return mostObservers; } public long mostObserversEver() { - tx.throwIfError(); return mostObserversEver; } public ChampionObserver championObservers() { - tx.throwIfError(); return championObservers; } @@ -339,14 +330,14 @@ public boolean tooManyObserved(Observer observer, Mutable mutable, DefaultMap int n = LeafTransaction.sizeForConsistency(observeds); if (n <= maxNrOfObserved()) { if (mostObserved < n) { - mostObserved = n; + mostObserved = n; championObserved = new ChampionObserved(observer, mutable, observeds); } return false; } synchronized (tx) { if (mostObserved < n) { - mostObserved = n; + mostObserved = n; championObserved = new ChampionObserved(observer, mutable, observeds); } } @@ -354,17 +345,14 @@ public boolean tooManyObserved(Observer observer, Mutable mutable, DefaultMap } public int mostObserved() { - tx.throwIfError(); return mostObserved; } public long mostObservedEver() { - tx.throwIfError(); return mostObservedEver; } public ChampionObserved championObserved() { - tx.throwIfError(); return championObserved; } @@ -376,32 +364,32 @@ public UniverseTransaction universeTransaction() { @Override public String toString() { return "UniverseStats:\n" // - + " debugging = " + debugging + "\n" // - + " runCount = " + runCount + "\n" // - + " forwardCount = " + forwardCount + "\n" // - + " totalChanges = " + totalChanges + "\n" // - + " totalChangesEver = " + totalChangesEver + "\n" // - + " mostTotalChangesEver = " + mostTotalChangesEver + "\n" // - + " mostObservers = " + mostObservers + "\n" // - + " mostObserversEver = " + mostObserversEver + "\n" // - + " championObservers = " + championObservers + "\n" // - + " mostObserved = " + mostObserved + "\n" // - + " mostObservedEver = " + mostObservedEver + "\n" // - + " championObserved = " + championObserved + "\n" // - + " mostChangesPerInstance = " + mostChangesPerInstance + "\n" // - + " mostChangesPerInstanceEver = " + mostChangesPerInstanceEver + "\n" // - + " championChangesPerInstance = " + championChangesPerInstance + "\n" // - ; + + " debugging = " + debugging + "\n" // + + " runCount = " + runCount + "\n" // + + " forwardCount = " + forwardCount + "\n" // + + " totalChanges = " + totalChanges + "\n" // + + " totalChangesEver = " + totalChangesEver + "\n" // + + " mostTotalChangesEver = " + mostTotalChangesEver + "\n" // + + " mostObservers = " + mostObservers + "\n" // + + " mostObserversEver = " + mostObserversEver + "\n" // + + " championObservers = " + championObservers + "\n" // + + " mostObserved = " + mostObserved + "\n" // + + " mostObservedEver = " + mostObservedEver + "\n" // + + " championObserved = " + championObserved + "\n" // + + " mostChangesPerInstance = " + mostChangesPerInstance + "\n" // + + " mostChangesPerInstanceEver = " + mostChangesPerInstanceEver + "\n" // + + " championChangesPerInstance = " + championChangesPerInstance + "\n" // + ; } public String shortString() { return String.format("[debug=%-5s run=%6d forward=%6d changes=%6d/%6d/%6d pInst=%6d/%6d/%s observers=%6d/%6d/%s observed=%6d/%6d/%s]", // - debugging, runCount, forwardCount, // - totalChanges, mostTotalChangesEver, totalChangesEver, // - mostChangesPerInstance, mostChangesPerInstanceEver, championChangesPerInstance, // - mostObservers, mostObserversEver, championObservers, // - mostObserved, mostObservedEver, championObserved // - ); + debugging, runCount, forwardCount, // + totalChanges, mostTotalChangesEver, totalChangesEver, // + mostChangesPerInstance, mostChangesPerInstanceEver, championChangesPerInstance, // + mostObservers, mostObserversEver, championObservers, // + mostObserved, mostObservedEver, championObserved // + ); } @Override @@ -414,42 +402,42 @@ public boolean equals(Object o) { } UniverseStatistics that = (UniverseStatistics) o; return tx == that.tx // - && debugging == that.debugging // - && runCount == that.runCount // - && forwardCount == that.forwardCount // - && totalChanges == that.totalChanges // - && totalChangesEver == that.totalChangesEver // - && mostTotalChangesEver == that.mostTotalChangesEver // - && mostObservers == that.mostObservers // - && mostObserversEver == that.mostObserversEver // - && Objects.equals(championObservers, that.championObservers) // - && mostObserved == that.mostObserved // - && mostObservedEver == that.mostObservedEver // - && Objects.equals(championObserved, that.championObserved) // - && mostChangesPerInstance == that.mostChangesPerInstance // - && mostChangesPerInstanceEver == that.mostChangesPerInstanceEver // - && Objects.equals(championChangesPerInstance, that.championChangesPerInstance) // - ; + && debugging == that.debugging // + && runCount == that.runCount // + && forwardCount == that.forwardCount // + && totalChanges == that.totalChanges // + && totalChangesEver == that.totalChangesEver // + && mostTotalChangesEver == that.mostTotalChangesEver // + && mostObservers == that.mostObservers // + && mostObserversEver == that.mostObserversEver // + && Objects.equals(championObservers, that.championObservers) // + && mostObserved == that.mostObserved // + && mostObservedEver == that.mostObservedEver // + && Objects.equals(championObserved, that.championObserved) // + && mostChangesPerInstance == that.mostChangesPerInstance // + && mostChangesPerInstanceEver == that.mostChangesPerInstanceEver // + && Objects.equals(championChangesPerInstance, that.championChangesPerInstance) // + ; } @Override public int hashCode() { return Objects.hash(tx, // - debugging, // - runCount, // - forwardCount, // - totalChanges, // - totalChangesEver, // - mostTotalChangesEver, // - mostObservers, // - mostObserversEver, // - championObservers, // - mostObserved, // - mostObservedEver, // - championObserved, // - mostChangesPerInstance, // - mostChangesPerInstanceEver, // - championChangesPerInstance // - ); + debugging, // + runCount, // + forwardCount, // + totalChanges, // + totalChangesEver, // + mostTotalChangesEver, // + mostObservers, // + mostObserversEver, // + championObservers, // + mostObserved, // + mostObservedEver, // + championObserved, // + mostChangesPerInstance, // + mostChangesPerInstanceEver, // + championChangesPerInstance // + ); } } diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 142b47e5..622f8e56 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -582,11 +582,11 @@ private State triggerAction(State state, Action action) { private void handleTooManyChanges(State state) { if (!killed && stats().debugging() && !errors.get().anyMatch(e -> e instanceof TooManyChangesException)) { ObserverTrace trace = state// - .filter(o -> o instanceof Mutable, s -> s instanceof Observer.Traces) // - .flatMap(e1 -> e1.getValue().map(e2 -> ((Set) e2.getValue()).sorted().findFirst().orElseThrow())) // + .filter(o -> o instanceof Mutable, s -> s instanceof Observer.Debugs) // + .flatMap(e1 -> e1.getValue().map(e2 -> ((List) e2.getValue()).last())) // .min((a, b) -> Integer.compare(b.done().size(), a.done().size())) // .orElseThrow(); - throw new TooManyChangesException(state, trace, trace.done().size()); + throw new TooManyChangesException(state, trace, stats().totalChanges()); } } From 778ffa0b894afdfeba1f7125cb0986a069ddb660 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Tue, 5 Dec 2023 13:22:00 +0100 Subject: [PATCH 008/179] minor reshuffle caused by Context class changes in imm-coll --- .../org/modelingvalue/dclare/DclareTrace.java | 6 ++--- .../org/modelingvalue/dclare/OneShot.java | 2 +- .../dclare/UniverseTransaction.java | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/DclareTrace.java b/src/main/java/org/modelingvalue/dclare/DclareTrace.java index b4d3f1f5..153cfdf4 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareTrace.java +++ b/src/main/java/org/modelingvalue/dclare/DclareTrace.java @@ -15,11 +15,11 @@ package org.modelingvalue.dclare; +import org.modelingvalue.collections.util.ContextThread; + import java.util.Arrays; import java.util.stream.IntStream; -import org.modelingvalue.collections.util.ContextThread; - public class DclareTrace { private static final int TAG_LENGTH = 8; @@ -34,7 +34,7 @@ public class DclareTrace { public static String getLineStart(String tag, Transaction current) { StringBuilder b = new StringBuilder(TRACE_BASE); superImpose(b, tag.length() <= TAG_LENGTH ? tag : tag.substring(0, TAG_LENGTH), 0); - superImpose(b, getThreadNum(ContextThread.getNr()), TAG_LENGTH + 1); + superImpose(b, getThreadNum(ContextThread.getCurrentNr()), TAG_LENGTH + 1); if (current != null) { superImpose(b, current.getCurrentTypeForTrace(), TAG_LENGTH + 1 + THREAD_NUM_LENGTH + 1); } diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 006b1858..edde06b8 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -20,7 +20,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.ContextThread; -import org.modelingvalue.collections.util.ContextThread.ContextPool; +import org.modelingvalue.collections.util.ContextPool; import org.modelingvalue.collections.util.MutationWrapper; import java.lang.annotation.ElementType; diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 142b47e5..11d343dc 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -15,23 +15,13 @@ package org.modelingvalue.dclare; -import java.util.Iterator; -import java.util.Objects; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import java.util.function.Predicate; - import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.DefaultMap; import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Concurrent; -import org.modelingvalue.collections.util.ContextThread.ContextPool; +import org.modelingvalue.collections.util.ContextPool; import org.modelingvalue.collections.util.StatusProvider; import org.modelingvalue.collections.util.StatusProvider.AbstractStatus; import org.modelingvalue.collections.util.StatusProvider.StatusIterator; @@ -41,6 +31,16 @@ import org.modelingvalue.dclare.ex.ConsistencyError; import org.modelingvalue.dclare.ex.TooManyChangesException; +import java.util.Iterator; +import java.util.Objects; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; +import java.util.function.Predicate; + @SuppressWarnings("unused") public class UniverseTransaction extends MutableTransaction { From af7fc78264b8ac46278ddc5e681daf832292017c Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 5 Dec 2023 15:11:13 +0100 Subject: [PATCH 009/179] wait for trace with depth --- .../java/org/modelingvalue/dclare/ObserverTransaction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 74a05188..f72cc1a3 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -206,11 +206,11 @@ protected void trace(State pre, DefaultMap> observeds) { if (stats.debugging() && changed.get().equals(TRUE)) { int maxNrOfChanges = stats.maxNrOfChanges(); ObserverTrace trace = trace(pre, observeds, observer().debugs(), nrOfChanges > maxNrOfChanges ? nrOfChanges : totalNrOfChanges); - if (nrOfChanges > maxNrOfChanges + Math.min(maxNrOfChanges, 32)) { + if (trace.done().size() > Math.min(maxNrOfChanges, 32)) { throw new TooManyChangesException(current(), trace, nrOfChanges); } int maxTotalNrOfChanges = stats.maxTotalNrOfChanges(); - if (totalNrOfChanges > maxTotalNrOfChanges + Math.min(maxTotalNrOfChanges, 128)) { + if (totalNrOfChanges > maxTotalNrOfChanges + Math.min(maxTotalNrOfChanges, 256)) { throw new TooManyChangesException(current(), trace, totalNrOfChanges); } } From 573bab7fa438f2c62395583a6ea21c46a68adef6 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Wed, 6 Dec 2023 14:55:18 +0100 Subject: [PATCH 010/179] minor hashCode improvements --- .../java/org/modelingvalue/dclare/Leaf.java | 15 ++++---- .../org/modelingvalue/dclare/Mutable.java | 7 +++- .../java/org/modelingvalue/dclare/This.java | 37 ++++++++++++------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 0de4080c..ebc4e3d3 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -15,35 +15,37 @@ package org.modelingvalue.dclare; +import java.util.Objects; + import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.StringUtil; public abstract class Leaf implements TransactionClass, Feature { - private final Object id; private final Priority initPriority; private final Set> modifierSet; + private final int hashCode; protected Leaf(Object id, LeafModifier... modifiers) { - this.id = id; + this.id = id; this.modifierSet = Collection.of(modifiers).notNull().asSet(); Priority prio = getModifier(Priority.class); this.initPriority = prio == null ? Priority.one : prio; + this.hashCode = Objects.hash(id, getClass()); } public boolean hasModifier(LeafModifier modifier) { return modifierSet.contains(modifier); } - @SuppressWarnings({"unused", "unchecked"}) - public > SM getModifier(Class modifierClass) { - return (SM) FeatureModifier.ofClass(modifierClass, modifierSet); + protected > SM getModifier(Class modifierClass) { + return FeatureModifier.ofClass(modifierClass, modifierSet); } @Override public int hashCode() { - return id.hashCode() ^ getClass().hashCode(); + return hashCode; } @Override @@ -71,5 +73,4 @@ public Object id() { protected Priority initPriority() { return initPriority; } - } diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 4e1377c2..fee10277 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -15,7 +15,10 @@ package org.modelingvalue.dclare; -import static org.modelingvalue.dclare.CoreSetableModifier.*; +import static org.modelingvalue.dclare.CoreSetableModifier.doNotMerge; +import static org.modelingvalue.dclare.CoreSetableModifier.durable; +import static org.modelingvalue.dclare.CoreSetableModifier.plumbing; +import static org.modelingvalue.dclare.CoreSetableModifier.preserved; import java.util.function.Predicate; @@ -31,7 +34,7 @@ @SuppressWarnings("unused") public interface Mutable extends TransactionClass { - Mutable THIS = new This(); + Mutable THIS = This.singleton(); Set THIS_SINGLETON = Set.of(THIS); diff --git a/src/main/java/org/modelingvalue/dclare/This.java b/src/main/java/org/modelingvalue/dclare/This.java index 46d6deb2..b64b3e55 100644 --- a/src/main/java/org/modelingvalue/dclare/This.java +++ b/src/main/java/org/modelingvalue/dclare/This.java @@ -16,27 +16,32 @@ package org.modelingvalue.dclare; import java.io.Serializable; +import java.util.Random; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Internable; public final class This implements Mutable, Internable, Serializable { - private static final long serialVersionUID = 5000610308072466985L; - private static final MutableClass THIS_CLASS = new MutableClass() { - @Override - public Set> dObservers() { - return Set.of(); - } - - @Override - public Set> dSetables() { - return Set.of(); - } - }; - - public This() { + @Override + public Set> dObservers() { + return Set.of(); + } + + @Override + public Set> dSetables() { + return Set.of(); + } + }; + private static final int HASH = new Random().nextInt(); + private static final This THIS = new This(); + + public static This singleton() { + return THIS; + } + + private This() { super(); } @@ -55,4 +60,8 @@ public final Mutable dResolve(Mutable self) { return self; } + @Override + public int hashCode() { + return HASH; + } } From ea4037ac971de66a8f3921a429c78001b64c0596 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 7 Dec 2023 12:19:01 +0100 Subject: [PATCH 011/179] fixpoint groups --- .../java/org/modelingvalue/dclare/Action.java | 6 ++- .../dclare/ActionTransaction.java | 3 +- .../org/modelingvalue/dclare/Direction.java | 44 ++++++++++++++++--- .../modelingvalue/dclare/FixpointGroup.java | 23 ++++++++++ .../java/org/modelingvalue/dclare/Leaf.java | 2 +- .../modelingvalue/dclare/LeafTransaction.java | 4 ++ .../modelingvalue/dclare/ObserverTrace.java | 1 + .../dclare/ObserverTransaction.java | 16 +++---- 8 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/modelingvalue/dclare/FixpointGroup.java diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index e0eaeaa0..1374e405 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -69,10 +69,14 @@ public ActionTransaction newTransaction(UniverseTransaction universeTransaction) return new ActionTransaction(universeTransaction); } - public Direction direction() { + public final Direction direction() { return direction; } + public final FixpointGroup fixpointGroup() { + return direction().fixpointGroup(); + } + @Override public String toString() { return (direction != Direction.DEFAULT ? (direction + "::") : "") + super.toString(); diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 335ebc28..23741e0d 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -175,7 +175,8 @@ private void trigger(O object, Observed observed) { for (Mutable m : e.getValue()) { Mutable target = m.dResolve((Mutable) object); if (!action().equals(observer) || !source.equals(target)) { - trigger(target, observer, observer.initPriority()); + Priority priority = observer.fixpointGroup() == fixpointGroup() ? observer.initPriority() : Priority.OUTER; + trigger(target, observer, priority); if (universeTransaction().getConfig().isTraceMutable()) { runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (TRIGGER " + target + "." + observer + ")")); } diff --git a/src/main/java/org/modelingvalue/dclare/Direction.java b/src/main/java/org/modelingvalue/dclare/Direction.java index 567830c2..b5ec7750 100644 --- a/src/main/java/org/modelingvalue/dclare/Direction.java +++ b/src/main/java/org/modelingvalue/dclare/Direction.java @@ -24,19 +24,35 @@ public interface Direction extends LeafModifier, SetableModifier, Internable { static Direction of(Object id, Direction... opposites) { - return new DirectionImpl(id, false, opposites); + return new DirectionImpl(id, false, FixpointGroup.DEFAULT, opposites); } static Direction of(Object id, Supplier> oppositeSupplier) { - return new DirectionImpl(id, false, oppositeSupplier); + return new DirectionImpl(id, false, FixpointGroup.DEFAULT, oppositeSupplier); } static Direction of(Object id, boolean lazy, Direction... opposites) { - return new DirectionImpl(id, lazy, opposites); + return new DirectionImpl(id, lazy, FixpointGroup.DEFAULT, opposites); } static Direction of(Object id, boolean lazy, Supplier> oppositeSupplier) { - return new DirectionImpl(id, lazy, oppositeSupplier); + return new DirectionImpl(id, lazy, FixpointGroup.DEFAULT, oppositeSupplier); + } + + static Direction of(Object id, FixpointGroup fixpointGroup, Direction... opposites) { + return new DirectionImpl(id, false, fixpointGroup, opposites); + } + + static Direction of(Object id, FixpointGroup fixpointGroup, Supplier> oppositeSupplier) { + return new DirectionImpl(id, false, fixpointGroup, oppositeSupplier); + } + + static Direction of(Object id, boolean lazy, FixpointGroup fixpointGroup, Direction... opposites) { + return new DirectionImpl(id, lazy, fixpointGroup, opposites); + } + + static Direction of(Object id, boolean lazy, FixpointGroup fixpointGroup, Supplier> oppositeSupplier) { + return new DirectionImpl(id, lazy, fixpointGroup, oppositeSupplier); } Direction DEFAULT = new Direction() { @@ -54,28 +70,37 @@ public Set opposites() { public boolean isLazy() { return false; } + + @Override + public FixpointGroup fixpointGroup() { + return FixpointGroup.DEFAULT; + } }; Set opposites(); boolean isLazy(); + FixpointGroup fixpointGroup(); + static final class DirectionImpl implements Direction { private final Object id; private final boolean lazy; private final Supplier> oppositeSupplier; + private final FixpointGroup fixpointGroup; private Set opposites = null; - private DirectionImpl(Object id, boolean lazy, Direction... opposites) { - this(id, lazy, () -> Collection.of(opposites).asSet()); + private DirectionImpl(Object id, boolean lazy, FixpointGroup fixpointGroup, Direction... opposites) { + this(id, lazy, fixpointGroup, () -> Collection.of(opposites).asSet()); } - private DirectionImpl(Object id, boolean lazy, Supplier> oppositeSupplier) { + private DirectionImpl(Object id, boolean lazy, FixpointGroup fixpointGroup, Supplier> oppositeSupplier) { this.id = id; this.lazy = lazy; this.oppositeSupplier = oppositeSupplier; + this.fixpointGroup = fixpointGroup; } @Override @@ -112,6 +137,11 @@ public Set opposites() { return opposites; } + @Override + public final FixpointGroup fixpointGroup() { + return fixpointGroup; + } + } } diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java new file mode 100644 index 00000000..a23b8d7a --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -0,0 +1,23 @@ +package org.modelingvalue.dclare; + +public interface FixpointGroup { + + FixpointGroup DEFAULT = new FixpointGroup() { + + @Override + public String toString() { + return ""; + } + + }; + + static FixpointGroup of(String name) { + return new FixpointGroup() { + @Override + public String toString() { + return name; + } + }; + } + +} diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 0de4080c..222b11de 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -68,7 +68,7 @@ public Object id() { return id; } - protected Priority initPriority() { + protected final Priority initPriority() { return initPriority; } diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index 61602ae5..c476c3af 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -206,6 +206,10 @@ public O directConstruct(Construction.Reason reason, Supplie public abstract Direction direction(); + public final FixpointGroup fixpointGroup() { + return direction().fixpointGroup(); + } + public IState preStartState(Priority priority) { return universeTransaction().preStartState(priority); } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 848edd52..7019610e 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -65,6 +65,7 @@ protected ObserverTrace(Mutable mutable, Observer observer, ObserverTrace pre this.backTrace = backTrace; this.done = done.addAll(back).addAll(backDone).addAll(previous != null ? previous.done.add(previous) : Set.of()); this.time = Instant.now(); + System.err.println("!!!!!!!!!!! " + this.done.size()); } public Instant time() { diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index f72cc1a3..d4bf6d23 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -200,26 +200,26 @@ protected void bumpTotalChanges() { @SuppressWarnings({"rawtypes"}) protected void trace(State pre, DefaultMap> observeds) { if (observer().isTracing()) { - trace(pre, observeds, observer().traces(), nrOfChanges); + trace(pre, observeds, observer().traces()); } UniverseStatistics stats = universeTransaction().stats(); if (stats.debugging() && changed.get().equals(TRUE)) { - int maxNrOfChanges = stats.maxNrOfChanges(); - ObserverTrace trace = trace(pre, observeds, observer().debugs(), nrOfChanges > maxNrOfChanges ? nrOfChanges : totalNrOfChanges); - if (trace.done().size() > Math.min(maxNrOfChanges, 32)) { + ObserverTrace trace = trace(pre, observeds, observer().debugs()); + if (nrOfChanges > Math.min(stats.maxNrOfChanges(), 32) && trace.done().size() > 16) { throw new TooManyChangesException(current(), trace, nrOfChanges); } - int maxTotalNrOfChanges = stats.maxTotalNrOfChanges(); - if (totalNrOfChanges > maxTotalNrOfChanges + Math.min(maxTotalNrOfChanges, 256)) { + if (totalNrOfChanges > stats.maxTotalNrOfChanges() + Math.min(stats.maxTotalNrOfChanges(), 256) && trace.done().size() > 8) { throw new TooManyChangesException(current(), trace, totalNrOfChanges); } } } @SuppressWarnings({"rawtypes", "unchecked"}) - private ObserverTrace trace(State pre, DefaultMap> observeds, Setable> setable, int changes) { + private ObserverTrace trace(State pre, DefaultMap> observeds, Setable> setable) { List traces = setable.get(mutable()); - ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), changes, // + Pair> p = Mutable.D_PARENT_CONTAINING.get(mutable()); + observeds = observeds.put((Observed) p.b(), observeds.get((Observed) p.b()).add(p.a())); + ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), nrOfChanges, // observeds.filter(e -> !e.getKey().isPlumbing()).flatMap(e -> e.getValue().map(m -> { m = m.dResolve(mutable()); return Entry.of(ObservedInstance.of(m, e.getKey()), pre.get(m, e.getKey())); From 062da94018c9181ebd944a79a079adfed00efe12 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 7 Dec 2023 12:50:51 +0100 Subject: [PATCH 012/179] remove trace --- src/main/java/org/modelingvalue/dclare/ObserverTrace.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 7019610e..848edd52 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -65,7 +65,6 @@ protected ObserverTrace(Mutable mutable, Observer observer, ObserverTrace pre this.backTrace = backTrace; this.done = done.addAll(back).addAll(backDone).addAll(previous != null ? previous.done.add(previous) : Set.of()); this.time = Instant.now(); - System.err.println("!!!!!!!!!!! " + this.done.size()); } public Instant time() { From 636a1f37daf02da9a86c6035be365bfa193c7112 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 7 Dec 2023 17:12:08 +0100 Subject: [PATCH 013/179] extra fixpoint group Priority --- .../dclare/ActionTransaction.java | 2 +- .../dclare/ObserverTransaction.java | 23 ++++++++++--------- .../org/modelingvalue/dclare/Priority.java | 6 +++-- .../dclare/UniverseTransaction.java | 6 ++--- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 23741e0d..30a298b0 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -175,7 +175,7 @@ private void trigger(O object, Observed observed) { for (Mutable m : e.getValue()) { Mutable target = m.dResolve((Mutable) object); if (!action().equals(observer) || !source.equals(target)) { - Priority priority = observer.fixpointGroup() == fixpointGroup() ? observer.initPriority() : Priority.OUTER; + Priority priority = observer.fixpointGroup() == fixpointGroup() ? observer.initPriority() : Priority.five; trigger(target, observer, priority); if (universeTransaction().getConfig().isTraceMutable()) { runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (TRIGGER " + target + "." + observer + ")")); diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index d4bf6d23..c9fd59be 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -43,7 +43,7 @@ public class ObserverTransaction extends ActionTransaction { private final Concurrent> constructions = Concurrent.of(); private final Concurrent> emptyMandatory = Concurrent.of(); private final Concurrent> changed = Concurrent.of(); - private final Concurrents> defer = new Concurrents<>(Priority.two); + private final Concurrents> defer = new Concurrents<>(Priority.INNER); private Pair throwable; private int nrOfChanges; @@ -68,7 +68,7 @@ protected State merge() { emptyMandatory.merge(); changed.merge(); defer.merge(); - Map cons = constructions.merge(); //TODO @WIM: why is this not done in the 'if' below? + Map cons = constructions.merge(); // The merge must be done after merge. if (throwable == null) { Set ch = changed.get(); observer().constructed().set(mutable(), cons); @@ -224,7 +224,8 @@ private ObserverTrace trace(State pre, DefaultMap> observ m = m.dResolve(mutable()); return Entry.of(ObservedInstance.of(m, e.getKey()), pre.get(m, e.getKey())); })).asMap(e -> e), // - pre.diff(current(), o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).flatMap(e1 -> e1.getValue().map(e2 -> Entry.of(ObservedInstance.of((Mutable) e1.getKey(), (Observed) e2.getKey()), e2.getValue().b()))).asMap(e -> e)); + pre.diff(current(), o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).// + flatMap(e1 -> e1.getValue().map(e2 -> Entry.of(ObservedInstance.of((Mutable) e1.getKey(), (Observed) e2.getKey()), e2.getValue().b()))).asMap(e -> e)); setable.set(mutable(), traces.append(trace)); return trace; } @@ -486,25 +487,25 @@ private boolean isChanged(O object, Observed many, ContainingCol } private , E> Priority added(O object, Observed observed, E added, boolean forward, boolean isNew) { - return added(object, observed, startState(Priority.two), state(), added, forward) ? Priority.two : // + return added(object, observed, startState(Priority.INNER), state(), added, forward) ? Priority.INNER : // becameDerived(observed, added, startState(Priority.three), current()) ? Priority.three : // (isNew && added(object, observed, startState(), startState(Priority.four), added, forward)) ? Priority.four : // - added(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), added, forward) ? Priority.five : null; + added(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), added, forward) ? Priority.OUTER : null; } private , E> Priority removed(O object, Observed observed, E removed, boolean forward, boolean isNew) { - return removed(object, observed, startState(Priority.two), state(), removed, forward) ? Priority.two : // + return removed(object, observed, startState(Priority.INNER), state(), removed, forward) ? Priority.INNER : // (isNew && removed(object, observed, startState(), startState(Priority.four), removed, forward)) ? Priority.four : // - becameContained(observed, removed, startState(Priority.four), startState(Priority.two)) ? Priority.four : // - removed(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), removed, forward) ? Priority.five : null; + becameContained(observed, removed, startState(Priority.four), startState(Priority.INNER)) ? Priority.four : // + removed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), removed, forward) ? Priority.OUTER : null; } private Priority changed(O object, Observed observed, T pre, T post, boolean forward, boolean isNew) { - return changed(object, observed, startState(Priority.two), state(), pre, post, forward) ? Priority.two : // + return changed(object, observed, startState(Priority.INNER), state(), pre, post, forward) ? Priority.INNER : // becameDerived(observed, post, startState(Priority.three), current()) ? Priority.three : // (isNew && changed(object, observed, startState(), startState(Priority.four), pre, post, forward)) ? Priority.four : // - becameContained(observed, pre, startState(Priority.four), startState(Priority.two)) ? Priority.four : // - changed(object, observed, preStartState(Priority.five).raw(), startState(Priority.five), pre, post, forward) ? Priority.five : null; + becameContained(observed, pre, startState(Priority.four), startState(Priority.INNER)) ? Priority.four : // + changed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), pre, post, forward) ? Priority.OUTER : null; } private , E> boolean added(O object, Observed observed, IState preState, IState postState, E added, boolean forward) { diff --git a/src/main/java/org/modelingvalue/dclare/Priority.java b/src/main/java/org/modelingvalue/dclare/Priority.java index 17ecff20..b15a94cd 100644 --- a/src/main/java/org/modelingvalue/dclare/Priority.java +++ b/src/main/java/org/modelingvalue/dclare/Priority.java @@ -36,12 +36,14 @@ public enum Priority implements LeafModifier, Internable { four, - five; // Deferred scheduled outer + five, // For Fixpoint Groups + + six; // Deferred scheduled outer // To prevent Array allocations each time Priority.values() is called. public static final Priority[] ALL = Priority.values(); public static final Priority INNER = two; - public static final Priority OUTER = five; + public static final Priority OUTER = six; public final static class Queued extends Setable> { diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 622f8e56..6f05a3ac 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -175,8 +175,8 @@ public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig con universeStatistics = new UniverseStatistics(this); start(universe, null); preState = startState; - preStartStates = new MutableStates(Priority.two, () -> createMutableState(emptyState)); - startStates = new MutableStates(Priority.two, () -> createMutableState(emptyState)); + preStartStates = new MutableStates(Priority.INNER, () -> createMutableState(emptyState)); + startStates = new MutableStates(Priority.INNER, () -> createMutableState(emptyState)); List states = List.of(); for (int i = 0; i < startStates.length(); i++) { Priority p = startStates.priority(i); @@ -419,7 +419,7 @@ protected State run(State state) { if (!killed && orphansDetected.get() == Boolean.TRUE) { preOrphansState = startState(Priority.INNER).preState(); state = trigger(state, universe(), clearOrphans, Priority.INNER); - priority = Priority.two; + priority = Priority.INNER; } else { priority = killed ? null : hasQueued(state); if (!killed && (priority == null || priority == Priority.OUTER) && orphansDetected.get() == null) { From c98ecbf8f013c78d7421a458e36ec7f5265b1670 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Thu, 7 Dec 2023 23:26:50 +0100 Subject: [PATCH 014/179] also adjust test classes --- .../modelingvalue/dclare/test/support/CommunicationHelper.java | 2 +- .../java/org/modelingvalue/dclare/test/support/ModelMaker.java | 2 +- src/test/java/org/modelingvalue/dclare/test/support/Shared.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java index a638d418..6cf033bc 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java @@ -17,7 +17,7 @@ import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; -import org.modelingvalue.collections.util.ContextThread.ContextPool; +import org.modelingvalue.collections.util.ContextPool; import org.modelingvalue.collections.util.MutationWrapper; import org.modelingvalue.collections.util.TraceTimer; import org.modelingvalue.dclare.sync.DeltaAdaptor; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index 4194d85d..82abf2a2 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -25,7 +25,7 @@ import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Concurrent; import org.modelingvalue.collections.util.ContextThread; -import org.modelingvalue.collections.util.ContextThread.ContextPool; +import org.modelingvalue.collections.util.ContextPool; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.dclare.Constant; import org.modelingvalue.dclare.DclareConfig; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java index 85c16175..b5dcd3c1 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java @@ -16,7 +16,7 @@ package org.modelingvalue.dclare.test.support; import org.modelingvalue.collections.util.ContextThread; -import org.modelingvalue.collections.util.ContextThread.ContextPool; +import org.modelingvalue.collections.util.ContextPool; import org.modelingvalue.collections.util.TraceTimer; import org.modelingvalue.dclare.State; import org.modelingvalue.dclare.UniverseTransaction; From 4d6fd79f89fe4f8dabdc68963a134ac36c951726 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 12 Dec 2023 12:15:46 +0100 Subject: [PATCH 015/179] schedule init fixpoint group based --- src/main/java/org/modelingvalue/dclare/Mutable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index f4ef930f..645873fe 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -42,7 +42,7 @@ public interface Mutable extends TransactionClass { @SuppressWarnings({"rawtypes", "unchecked"}) Setable>> D_OBSERVERS = Setable.of("D_OBSERVERS", Set.of(), (tx, obj, pre, post) -> Setable.>, Observer> diff(pre, post, // - added -> added.trigger(obj), // + added -> added.trigger(obj, added.fixpointGroup() == FixpointGroup.DEFAULT ? added.initPriority() : Priority.five), // removed -> { })); From 997a5b5241772b719f3e9321c2c9a2d443440316 Mon Sep 17 00:00:00 2001 From: automation Date: Tue, 12 Dec 2023 14:02:21 +0000 Subject: [PATCH 016/179] [no-ci] updated by mvgplugin --- .../org/modelingvalue/dclare/FixpointGroup.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java index a23b8d7a..93f4805f 100644 --- a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -1,3 +1,18 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus, Ronald Krijgsheld ~ +// Contributors: ~ +// Arjan Kok, Carel Bast ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; public interface FixpointGroup { From 3526150cad1385ce485d5cb580bc07e6af058d5f Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 14 Dec 2023 12:03:38 +0100 Subject: [PATCH 017/179] cleanup when to much equal hashes in constants --- .../modelingvalue/dclare/ConstantState.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index c7d680fe..06570057 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -28,6 +28,8 @@ import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.QualifiedSet; +import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.impl.HashCollectionImpl; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.StringUtil; @@ -320,6 +322,18 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, QualifiedSet prev = state.get(); Constants constants = prev.get(object); if (constants == null) { + Set allWithEqualhash = prev.allWithEqualhash(object); + if (allWithEqualhash.size() >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL - 2) { + int i = 0; + for (Constants c : allWithEqualhash) { + if (!(c.ref instanceof Constants.DurableRef)) { + prev = removeConstants(c); + if (++i >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL / 2) { + break; + } + } + } + } object = leafTransaction.state().canonical(object); constants = new Constants<>(object, referenceType, queue); QualifiedSet next = prev.add(constants); @@ -342,7 +356,7 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, return constants; } - private void removeConstants(Constants constants) { + private QualifiedSet removeConstants(Constants constants) { QualifiedSet prev = state.get(); Object object = constants.object(); constants = prev.get(object); @@ -351,11 +365,13 @@ private void removeConstants(Constants constants) { while (!state.compareAndSet(prev, next)) { prev = state.get(); if (prev.get(object) == null) { - return; + return prev; } next = prev.removeKey(object); } + return next; } + return prev; } private static enum ReferenceType { From 513a9ad0e5b6dfbaf7bf362c8962490e4b6d1399 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 8 Jan 2024 11:17:04 +0100 Subject: [PATCH 018/179] class cast exception fix --- .../java/org/modelingvalue/dclare/ObserverTransaction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index c9fd59be..f9c93a72 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -218,7 +218,9 @@ protected void trace(State pre, DefaultMap> observeds) { private ObserverTrace trace(State pre, DefaultMap> observeds, Setable> setable) { List traces = setable.get(mutable()); Pair> p = Mutable.D_PARENT_CONTAINING.get(mutable()); - observeds = observeds.put((Observed) p.b(), observeds.get((Observed) p.b()).add(p.a())); + if (p.b() instanceof Observed) { + observeds = observeds.put((Observed) p.b(), observeds.get((Observed) p.b()).add(p.a())); + } ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), nrOfChanges, // observeds.filter(e -> !e.getKey().isPlumbing()).flatMap(e -> e.getValue().map(m -> { m = m.dResolve(mutable()); From ee7d93f0c7afa4e12b3cb924744d76110d241fad Mon Sep 17 00:00:00 2001 From: automation Date: Mon, 8 Jan 2024 10:18:04 +0000 Subject: [PATCH 019/179] [no-ci] updated by mvgplugin --- .github/dependabot.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 +- settings.gradle.kts | 2 +- .../org/modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Action.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Constant.java | 2 +- src/main/java/org/modelingvalue/dclare/ConstantState.java | 2 +- src/main/java/org/modelingvalue/dclare/Construction.java | 2 +- src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareConfig.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/Derivation.java | 2 +- .../java/org/modelingvalue/dclare/DerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Direction.java | 2 +- src/main/java/org/modelingvalue/dclare/Feature.java | 2 +- src/main/java/org/modelingvalue/dclare/FeatureModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/FixpointGroup.java | 2 +- src/main/java/org/modelingvalue/dclare/Getable.java | 2 +- src/main/java/org/modelingvalue/dclare/IState.java | 2 +- src/main/java/org/modelingvalue/dclare/IdentityDerivation.java | 2 +- .../org/modelingvalue/dclare/IdentityDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Imperative.java | 2 +- .../java/org/modelingvalue/dclare/ImperativeTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/JsonToState.java | 2 +- src/main/java/org/modelingvalue/dclare/LazyDerivation.java | 2 +- .../org/modelingvalue/dclare/LazyDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Leaf.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/MatchInfo.java | 2 +- src/main/java/org/modelingvalue/dclare/Mutable.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableClass.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableState.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Newable.java | 2 +- src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java | 2 +- .../java/org/modelingvalue/dclare/NonInternableObserver.java | 2 +- src/main/java/org/modelingvalue/dclare/Observed.java | 2 +- src/main/java/org/modelingvalue/dclare/ObservedInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/Observer.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/OneShot.java | 2 +- src/main/java/org/modelingvalue/dclare/Priority.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnly.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ReusableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Setable.java | 2 +- src/main/java/org/modelingvalue/dclare/SetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/State.java | 2 +- src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMap.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMergeHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateToJson.java | 2 +- src/main/java/org/modelingvalue/dclare/This.java | 2 +- src/main/java/org/modelingvalue/dclare/Transaction.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionClass.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionId.java | 2 +- src/main/java/org/modelingvalue/dclare/TypeWrapper.java | 2 +- src/main/java/org/modelingvalue/dclare/Universe.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseStatistics.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java | 2 +- .../modelingvalue/dclare/ex/CycleInParentChainException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java | 2 +- .../org/modelingvalue/dclare/ex/EmptyMandatoryException.java | 2 +- .../org/modelingvalue/dclare/ex/NonDeterministicException.java | 2 +- .../java/org/modelingvalue/dclare/ex/OutOfScopeException.java | 2 +- .../org/modelingvalue/dclare/ex/ReferencedOrphanException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyChangesException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObservedException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObserversException.java | 2 +- .../java/org/modelingvalue/dclare/ex/TransactionException.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Converters.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/JsonIC.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerialisationPool.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerializationHelper.java | 2 +- .../modelingvalue/dclare/sync/SerializationHelperWithPool.java | 2 +- .../org/modelingvalue/dclare/sync/SocketSyncConnection.java | 2 +- .../java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java | 2 +- .../org/modelingvalue/dclare/sync/SyncConnectionHandler.java | 2 +- .../org/modelingvalue/dclare/sync/UniverseSynchronizer.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Util.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java | 2 +- .../java/org/modelingvalue/dclare/test/CommunicationTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/DclareTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/JsonICTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/NewableTests.java | 2 +- .../org/modelingvalue/dclare/test/SerialisationPoolTests.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationHelper.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationPeer.java | 2 +- .../java/org/modelingvalue/dclare/test/support/Fibonacci.java | 2 +- .../java/org/modelingvalue/dclare/test/support/ModelMaker.java | 2 +- .../org/modelingvalue/dclare/test/support/OneShotTests.java | 2 +- .../java/org/modelingvalue/dclare/test/support/PeerTester.java | 2 +- src/test/java/org/modelingvalue/dclare/test/support/Shared.java | 2 +- .../org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestMutable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestMutableClass.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestNewable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestNewableClass.java | 2 +- .../org/modelingvalue/dclare/test/support/TestObserved.java | 2 +- .../org/modelingvalue/dclare/test/support/TestScheduler.java | 2 +- .../org/modelingvalue/dclare/test/support/TestUniverse.java | 2 +- 109 files changed, 109 insertions(+), 109 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0dfe9c61..1d2e354a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/build.gradle.kts b/build.gradle.kts index 333f1a66..8773cd2b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/gradle.properties b/gradle.properties index 47258904..aa9d9a22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/settings.gradle.kts b/settings.gradle.kts index 8b5c355a..503d097e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 29fe4d31..3d6648e5 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index 1374e405..036f1fa9 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionInstance.java b/src/main/java/org/modelingvalue/dclare/ActionInstance.java index d650b18b..bc3ead64 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ActionInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 30a298b0..1b18eca3 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index f1626aab..9c736d7b 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 06570057..92221350 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Construction.java b/src/main/java/org/modelingvalue/dclare/Construction.java index 2b9c64dd..e6bfb497 100644 --- a/src/main/java/org/modelingvalue/dclare/Construction.java +++ b/src/main/java/org/modelingvalue/dclare/Construction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java index 2eec9219..018cb5ff 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareConfig.java b/src/main/java/org/modelingvalue/dclare/DclareConfig.java index c63bb9cc..28f56f63 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareConfig.java +++ b/src/main/java/org/modelingvalue/dclare/DclareConfig.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareTrace.java b/src/main/java/org/modelingvalue/dclare/DclareTrace.java index 153cfdf4..821d5d31 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareTrace.java +++ b/src/main/java/org/modelingvalue/dclare/DclareTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Derivation.java b/src/main/java/org/modelingvalue/dclare/Derivation.java index fc937b3f..34ee88b5 100644 --- a/src/main/java/org/modelingvalue/dclare/Derivation.java +++ b/src/main/java/org/modelingvalue/dclare/Derivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java index 06cce57d..394977cc 100644 --- a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Direction.java b/src/main/java/org/modelingvalue/dclare/Direction.java index b5ec7750..88229a1a 100644 --- a/src/main/java/org/modelingvalue/dclare/Direction.java +++ b/src/main/java/org/modelingvalue/dclare/Direction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Feature.java b/src/main/java/org/modelingvalue/dclare/Feature.java index 34e5a83e..497b5e7e 100644 --- a/src/main/java/org/modelingvalue/dclare/Feature.java +++ b/src/main/java/org/modelingvalue/dclare/Feature.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java index 261142d7..31df231c 100644 --- a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java +++ b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java index 93f4805f..63689b9f 100644 --- a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Getable.java b/src/main/java/org/modelingvalue/dclare/Getable.java index 95c89fe4..7b46c6c0 100644 --- a/src/main/java/org/modelingvalue/dclare/Getable.java +++ b/src/main/java/org/modelingvalue/dclare/Getable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IState.java b/src/main/java/org/modelingvalue/dclare/IState.java index 19273c36..153a8617 100644 --- a/src/main/java/org/modelingvalue/dclare/IState.java +++ b/src/main/java/org/modelingvalue/dclare/IState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java index 728f309d..b099e5cc 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 713d3dd7..da89bfa0 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Imperative.java b/src/main/java/org/modelingvalue/dclare/Imperative.java index bfd8bb7f..0092578a 100644 --- a/src/main/java/org/modelingvalue/dclare/Imperative.java +++ b/src/main/java/org/modelingvalue/dclare/Imperative.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 1b896da7..68974869 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/JsonToState.java b/src/main/java/org/modelingvalue/dclare/JsonToState.java index 0764ac22..6dbeb6e6 100644 --- a/src/main/java/org/modelingvalue/dclare/JsonToState.java +++ b/src/main/java/org/modelingvalue/dclare/JsonToState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java index b05161a8..787a1373 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index 409c818e..0e092b3e 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 6df1b620..7a46032e 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafModifier.java b/src/main/java/org/modelingvalue/dclare/LeafModifier.java index 6c3aa05b..864ecc8e 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/LeafModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index c476c3af..d807be84 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index fa628833..738a5c8f 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 533dadc9..61c32624 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableClass.java b/src/main/java/org/modelingvalue/dclare/MutableClass.java index 3a2e93d7..8cbf535f 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableClass.java +++ b/src/main/java/org/modelingvalue/dclare/MutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index 3bdd1f54..c4a7cb46 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index 4614a1ef..b7e45d1f 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Newable.java b/src/main/java/org/modelingvalue/dclare/Newable.java index 44cbd476..c255c678 100644 --- a/src/main/java/org/modelingvalue/dclare/Newable.java +++ b/src/main/java/org/modelingvalue/dclare/Newable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 28a7f7a9..5b5ac2f4 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java index a367c101..75950c82 100644 --- a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index 0143e817..0c5875ed 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java index 2e939d82..3431686f 100644 --- a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index 377d0ca1..1d720412 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 848edd52..159d90e3 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index f9c93a72..e93b2b47 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index edde06b8..543d93c5 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Priority.java b/src/main/java/org/modelingvalue/dclare/Priority.java index b15a94cd..db664b78 100644 --- a/src/main/java/org/modelingvalue/dclare/Priority.java +++ b/src/main/java/org/modelingvalue/dclare/Priority.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnly.java b/src/main/java/org/modelingvalue/dclare/ReadOnly.java index ddf34ca6..66438262 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnly.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnly.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 5dd49bf8..17c8c845 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java index 05887a56..838ed27a 100644 --- a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index bfcb3a95..c63711f3 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/SetableModifier.java b/src/main/java/org/modelingvalue/dclare/SetableModifier.java index 010d2eb6..98d249af 100644 --- a/src/main/java/org/modelingvalue/dclare/SetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/SetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index a152e886..13a37c9f 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java index 5787ed9a..8579449c 100644 --- a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMap.java b/src/main/java/org/modelingvalue/dclare/StateMap.java index f5d9a09f..7626b1dc 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMap.java +++ b/src/main/java/org/modelingvalue/dclare/StateMap.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java index 9cc4eacc..4bbbc22e 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index cf086850..4a470017 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/This.java b/src/main/java/org/modelingvalue/dclare/This.java index b64b3e55..098c4044 100644 --- a/src/main/java/org/modelingvalue/dclare/This.java +++ b/src/main/java/org/modelingvalue/dclare/This.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Transaction.java b/src/main/java/org/modelingvalue/dclare/Transaction.java index dab3c1d6..aab74a2b 100644 --- a/src/main/java/org/modelingvalue/dclare/Transaction.java +++ b/src/main/java/org/modelingvalue/dclare/Transaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionClass.java b/src/main/java/org/modelingvalue/dclare/TransactionClass.java index 65035d02..d95ce488 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionClass.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionId.java b/src/main/java/org/modelingvalue/dclare/TransactionId.java index 0e26df90..664d6a81 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionId.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionId.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java index f5921fe4..92913971 100644 --- a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java +++ b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index 4534640f..eb632e5d 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java index 770ea6ea..a280c655 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index cf373cb1..0e25a158 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java index 0b7613ce..13059ef8 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java index bbe3a323..fe22b2d9 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java index ab22b962..59ca0b28 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java index 8a21aa47..c314b51f 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java index 41b84772..b2cbe19f 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java index 20617ffd..44e86a10 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java index 30fb189b..5546929a 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java index 7c5705e9..f9ed913f 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java index d5df0fab..ba872ce0 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java index 0fe74fce..72b5fbb7 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java index b08c6b23..107e6cd9 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java index dbf82f68..df231e41 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Converters.java b/src/main/java/org/modelingvalue/dclare/sync/Converters.java index dddd7998..0e0fb0bf 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Converters.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Converters.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index b7ed01d8..3c6f079a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java index ea0cea6a..1d91a832 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java +++ b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java index 41e03450..298e7d5e 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java index 6d603497..4359df54 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java index 6cbbade3..6b857dd9 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java index 929e57f6..0f6b5ad0 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java index a54c49dd..a40aa692 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java index 69311bfc..3d323823 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java index 84c426e5..8995977c 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Util.java b/src/main/java/org/modelingvalue/dclare/sync/Util.java index 9b598529..bc053b7a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Util.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Util.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java index de733cfd..81e02c36 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java +++ b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java index afcb0d78..8042a15d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java index 073ba3eb..a8251f78 100644 --- a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java index 359397b7..94151483 100644 --- a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index 23da1cd3..4b0650a8 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java index f7315da8..89c3728e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java index 6cf033bc..1164d187 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java index a2896be7..b54f7fe6 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java index 4e9e3d95..cfcb22da 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index 82abf2a2..1fa3b7a9 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java index 9b6df564..7fe62d3a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java index b10c3bc6..6196f360 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java index b5dcd3c1..13f15148 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java index 7084a3ad..ead81301 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java index e9173433..d0b1af6e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java index b16ec491..dc34f553 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java index 2615232f..71f65057 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java index 83323c8f..33d54936 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java index 825874a0..33ecf2f1 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java index 9fad4ba9..1ebfe3e0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java index 076a51b0..da862794 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ From de73c36ed59e23eb2991e346a9b65a5b84ad861c Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 16 Jan 2024 16:10:04 +0100 Subject: [PATCH 020/179] Do not match (only replace if already matched) in may non-containment observed. --- .../org/modelingvalue/dclare/MatchInfo.java | 20 +++++++++++++------ .../dclare/ObserverTransaction.java | 10 +++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 738a5c8f..04428886 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -28,17 +28,21 @@ public class MatchInfo { private final Construction initialConstruction; private final boolean removed; private final Object identity; + private final boolean containment; + private final boolean many; private QualifiedSet allDerivations; @SuppressWarnings("rawtypes") - public static MatchInfo of(Newable newable, ObserverTransaction otx, Mutable object, Observed observed) { - return new MatchInfo(newable, otx, object, observed); + public static MatchInfo of(Newable newable, ObserverTransaction otx, Mutable object, Observed observed, boolean many) { + return new MatchInfo(newable, otx, object, observed, many); } @SuppressWarnings({"rawtypes", "unchecked"}) - private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Observed observed) { + private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Observed observed, boolean many) { this.newable = newable; + this.containment = observed.containment(); + this.many = many; ConstantState constants = otx.universeTransaction().tmpConstants(); removed = otx.startState(Priority.three).get(newable, Mutable.D_PARENT_CONTAINING) == null && // otx.preStartState(Priority.OUTER).getRaw(newable, Mutable.D_PARENT_CONTAINING) != null; @@ -47,7 +51,7 @@ private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Obse identity = constants.get(otx, newable, Newable.D_IDENTITY, n -> { if (!removed && (isDirect() || isDerived())) { State state = otx.current(); - if (observed.containment()) { + if (containment) { state = state.set(newable, Mutable.D_PARENT_CONTAINING, Pair.of(object, observed)); } return state.deriveIdentity(() -> n.dIdentity(), otx.depth(), otx.mutable(), constants); @@ -58,8 +62,12 @@ private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Obse } public boolean mustReplace(MatchInfo replaced) { - return canBeReplacing() && replaced.canBeReplaced() && Objects.equals(identity(), replaced.identity()) && // - !replaced.allDerivations.anyMatch(c -> (isDerived() && initialConstruction.reason().equals(c.reason())) || c.hasSource(newable)); + if (!many || containment) { + return canBeReplacing() && replaced.canBeReplaced() && Objects.equals(identity(), replaced.identity()) && // + !replaced.allDerivations.anyMatch(c -> (isDerived() && initialConstruction.reason().equals(c.reason())) || c.hasSource(newable)); + } else { + return newable.equals(replaced.newable().dReplacing()); + } } protected void setAllDerivations(MatchInfo other) { diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index e93b2b47..a3ea1e8a 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -576,8 +576,8 @@ private String deferPriorityName() { @SuppressWarnings({"rawtypes", "unchecked"}) private Object singleMatch(Mutable object, Observed observed, Object before, Object after) { if (after instanceof Newable && before instanceof Newable && ((Newable) after).dNewableType().equals(((Newable) before).dNewableType())) { - MatchInfo preInfo = MatchInfo.of((Newable) before, this, object, observed); - MatchInfo postInfo = MatchInfo.of((Newable) after, this, object, observed); + MatchInfo preInfo = MatchInfo.of((Newable) before, this, object, observed, false); + MatchInfo postInfo = MatchInfo.of((Newable) after, this, object, observed, false); if (preInfo.mustReplace(postInfo)) { replace(postInfo, preInfo); after = preInfo.newable(); @@ -593,7 +593,7 @@ private Object singleMatch(Mutable object, Observed observed, Object before, Obj found = true; break; } - MatchInfo valInfo = MatchInfo.of((Newable) val, this, object, cont); + MatchInfo valInfo = MatchInfo.of((Newable) val, this, object, cont, false); if (valInfo.identity() != null && valInfo.mustReplace(postInfo)) { found = true; replace(postInfo, valInfo); @@ -633,7 +633,7 @@ private Object manyMatch(Mutable object, Observed observed, ContainingCollection } } if (infos == null) { - infos = Collection.concat(befores, afters).distinct().filter(Newable.class).map(n -> MatchInfo.of(n, this, object, observed)).asQualifiedSet(MatchInfo::newable); + infos = Collection.concat(befores, afters).distinct().filter(Newable.class).map(n -> MatchInfo.of(n, this, object, observed, true)).asQualifiedSet(MatchInfo::newable); postInfo = infos.get((Newable) after); } MatchInfo preInfo = infos.get((Newable) before); @@ -658,7 +658,7 @@ private Object manyMatch(Mutable object, Observed observed, ContainingCollection befores = befores.replaceFirst(before, after); replace(preInfo, postInfo); break; - } else if (observed.containment() && universeTransaction().getConfig().isTraceMatching()) { + } else if (universeTransaction().getConfig().isTraceMatching()) { MatchInfo finalPostInfo = postInfo; runNonObserving(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable() + "." + observer() + " (" + preInfo + "!=" + finalPostInfo + ")")); } From 0aa47b0562b5a8f6bcb96618ed763faae487f99c Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 8 Feb 2024 08:05:03 +0100 Subject: [PATCH 021/179] atomic derivation --- .../dclare/AbstractDerivationTransaction.java | 77 +++++++++++++++---- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 3d6648e5..d1fcdd4e 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -30,11 +30,13 @@ public abstract class AbstractDerivationTransaction extends ReadOnlyTransaction { @SuppressWarnings("rawtypes") - protected static final Context>> DERIVED = Context.of(Set.of()); + protected static final Context>> DERIVED = Context.of(Set.of()); @SuppressWarnings("rawtypes") - protected static final Context> DERIVER = Context.of(null); - private static final Context DERIVE = Context.of(true); - private static final Context INDENT = Context.of(0); + protected static final Context> DERIVER = Context.of(null); + @SuppressWarnings("rawtypes") + private static final Context DERIVED_VALUE = Context.of(null); + private static final Context DERIVE = Context.of(true); + private static final Context INDENT = Context.of(0); public static boolean isDeriving() { return !DERIVED.get().isEmpty(); @@ -84,13 +86,17 @@ protected T current(O object, Getable getable) { return derive(object, getable, nonDerived); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) private T derive(O object, Getable getable, T nonDerived) { if (doDeriveGet(object, getable, nonDerived)) { Observed observed = (Observed) getable; + DerivedValue outerDerivedValue = DERIVED_VALUE.get(); + boolean isDerived = outerDerivedValue != null && outerDerivedValue.isDerived(object, observed); ConstantState mem = memoization(object); Constant constant = observed.constant(); - if (!mem.isSet(this, object, constant)) { + if (isDerived && outerDerivedValue.isSet()) { + return outerDerivedValue.get(); + } else if (!mem.isSet(this, object, constant)) { if (Newable.D_ALL_DERIVATIONS.equals(observed) || Mutable.D_PARENT_CONTAINING.equals(observed)) { return nonDerived; } else { @@ -106,7 +112,8 @@ private T derive(O object, Getable getable, T nonDerived) { if (isTraceDerivation(object, observed)) { runNonDeriving(() -> System.err.println(tracePre(object) + ">>>> " + object + "." + observed)); } - INDENT.run(INDENT.get() + 1, () -> DERIVED.run(newDerived, () -> { + DerivedValue innerDerivedValue = new DerivedValue(object, observed); + INDENT.run(INDENT.get() + 1, () -> DERIVED.run(newDerived, () -> DERIVED_VALUE.run(innerDerivedValue, () -> { int i = 0; Set observers = ((Mutable) object).dAllDerivers(observed).asSet(); for (Observer observer : observers.filter(Observer::anonymous)) { @@ -115,7 +122,10 @@ private T derive(O object, Getable getable, T nonDerived) { for (Observer observer : observers.exclude(Observer::anonymous)) { runDeriver((Mutable) object, observed, observer, ++i); } - })); + if (innerDerivedValue.isSet()) { + setInMemoization(mem, object, observed, innerDerivedValue.get()); + } + }))); if (!mem.isSet(this, object, constant)) { if (isTraceDerivation(object, observed)) { INDENT.run(INDENT.get() + 1, () -> runNonDeriving(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); @@ -167,20 +177,27 @@ public void runNonDeriving(Runnable action) { @Override public T set(O object, Setable setable, T post) { if (doDeriveSet(object, setable)) { + Observed observed = (Observed) setable; + DerivedValue derivedValue = DERIVED_VALUE.get(); + boolean isDerived = derivedValue.isDerived(object, observed); ConstantState mem = memoization(object); - Constant constant = setable.constant(); - T pre = mem.isSet(this, object, constant) ? mem.get(this, object, constant) : getNonDerived(object, setable); - T result = match(mem, setable, pre, post); - setInMemoization(mem, object, setable, result); - if (isTraceDerivation(object, setable)) { + Constant constant = observed.constant(); + T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(this, object, constant) ? mem.get(this, object, constant) : getNonDerived(object, setable); + T result = match(mem, observed, pre, post); + if (isDerived) { + derivedValue.set(result); + } else { + setInMemoization(mem, object, observed, result); + } + if (isTraceDerivation(object, observed)) { runNonDeriving(() -> { Pair deriver = DERIVER.get(); - System.err.println(tracePre(object) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + setable + "=" + pre + "->" + result + ")"); + System.err.println(tracePre(object) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); }); } - if (setable.containment()) { + if (observed.containment()) { Setable. diff(pre, result, added -> { - setInMemoization(mem, added, Mutable.D_PARENT_CONTAINING, Pair.of((Mutable) object, (Setable) setable)); + setInMemoization(mem, added, Mutable.D_PARENT_CONTAINING, Pair.of((Mutable) object, (Setable) observed)); }, removed -> { }); } @@ -275,4 +292,32 @@ public int depth() { return INDENT.get(); } + protected static class DerivedValue extends Pair> { + private static final long serialVersionUID = -2566539820227398813L; + + private T value; + + protected DerivedValue(O a, Observed b) { + super(a, b); + } + + protected T get() { + return value == ConstantState.NULL ? null : value; + } + + @SuppressWarnings("unchecked") + protected void set(T value) { + this.value = value == null ? (T) ConstantState.NULL : value; + } + + protected boolean isSet() { + return value != null; + } + + protected boolean isDerived(O object, Observed observed) { + return a().equals(object) && b().equals(observed); + } + + } + } From 33484c5118a4add5cfb51bf1e9394772e06df51f Mon Sep 17 00:00:00 2001 From: automation Date: Thu, 8 Feb 2024 07:06:11 +0000 Subject: [PATCH 022/179] [no-ci] updated by mvgplugin --- .github/dependabot.yml | 33 +++++++++++-------- build.gradle.kts | 33 +++++++++++-------- gradle.properties | 33 +++++++++++-------- settings.gradle.kts | 33 +++++++++++-------- .../dclare/AbstractDerivationTransaction.java | 33 +++++++++++-------- .../java/org/modelingvalue/dclare/Action.java | 33 +++++++++++-------- .../modelingvalue/dclare/ActionInstance.java | 33 +++++++++++-------- .../dclare/ActionTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Constant.java | 33 +++++++++++-------- .../modelingvalue/dclare/ConstantState.java | 33 +++++++++++-------- .../modelingvalue/dclare/Construction.java | 33 +++++++++++-------- .../dclare/CoreSetableModifier.java | 33 +++++++++++-------- .../modelingvalue/dclare/DclareConfig.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/DclareTrace.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Derivation.java | 33 +++++++++++-------- .../dclare/DerivationTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Direction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Feature.java | 33 +++++++++++-------- .../modelingvalue/dclare/FeatureModifier.java | 33 +++++++++++-------- .../modelingvalue/dclare/FixpointGroup.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Getable.java | 33 +++++++++++-------- .../java/org/modelingvalue/dclare/IState.java | 33 +++++++++++-------- .../dclare/IdentityDerivation.java | 33 +++++++++++-------- .../dclare/IdentityDerivationTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Imperative.java | 33 +++++++++++-------- .../dclare/ImperativeTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/JsonToState.java | 33 +++++++++++-------- .../modelingvalue/dclare/LazyDerivation.java | 33 +++++++++++-------- .../dclare/LazyDerivationTransaction.java | 33 +++++++++++-------- .../java/org/modelingvalue/dclare/Leaf.java | 33 +++++++++++-------- .../modelingvalue/dclare/LeafModifier.java | 33 +++++++++++-------- .../modelingvalue/dclare/LeafTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/MatchInfo.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Mutable.java | 33 +++++++++++-------- .../modelingvalue/dclare/MutableClass.java | 33 +++++++++++-------- .../modelingvalue/dclare/MutableState.java | 33 +++++++++++-------- .../dclare/MutableTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Newable.java | 33 +++++++++++-------- .../dclare/NonCheckingObserver.java | 33 +++++++++++-------- .../dclare/NonInternableObserver.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Observed.java | 33 +++++++++++-------- .../dclare/ObservedInstance.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Observer.java | 33 +++++++++++-------- .../modelingvalue/dclare/ObserverTrace.java | 33 +++++++++++-------- .../dclare/ObserverTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/OneShot.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Priority.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/ReadOnly.java | 33 +++++++++++-------- .../dclare/ReadOnlyTransaction.java | 33 +++++++++++-------- .../dclare/ReusableTransaction.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Setable.java | 33 +++++++++++-------- .../modelingvalue/dclare/SetableModifier.java | 33 +++++++++++-------- .../java/org/modelingvalue/dclare/State.java | 33 +++++++++++-------- .../dclare/StateDeltaHandler.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/StateMap.java | 33 +++++++++++-------- .../dclare/StateMergeHandler.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/StateToJson.java | 33 +++++++++++-------- .../java/org/modelingvalue/dclare/This.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Transaction.java | 33 +++++++++++-------- .../dclare/TransactionClass.java | 33 +++++++++++-------- .../modelingvalue/dclare/TransactionId.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/TypeWrapper.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/Universe.java | 33 +++++++++++-------- .../dclare/UniverseStatistics.java | 33 +++++++++++-------- .../dclare/UniverseTransaction.java | 33 +++++++++++-------- .../dclare/ex/ConsistencyError.java | 33 +++++++++++-------- .../ex/CycleInParentChainException.java | 33 +++++++++++-------- .../modelingvalue/dclare/ex/DebugTrace.java | 33 +++++++++++-------- .../dclare/ex/EmptyMandatoryException.java | 33 +++++++++++-------- .../dclare/ex/NonDeterministicException.java | 33 +++++++++++-------- .../dclare/ex/OutOfScopeException.java | 33 +++++++++++-------- .../dclare/ex/ReferencedOrphanException.java | 33 +++++++++++-------- .../dclare/ex/ThrowableError.java | 33 +++++++++++-------- .../dclare/ex/TooManyChangesException.java | 33 +++++++++++-------- .../dclare/ex/TooManyObservedException.java | 33 +++++++++++-------- .../dclare/ex/TooManyObserversException.java | 33 +++++++++++-------- .../dclare/ex/TransactionException.java | 33 +++++++++++-------- .../modelingvalue/dclare/sync/Converters.java | 33 +++++++++++-------- .../dclare/sync/DeltaAdaptor.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/sync/JsonIC.java | 33 +++++++++++-------- .../dclare/sync/SerialisationPool.java | 33 +++++++++++-------- .../dclare/sync/SerializationHelper.java | 33 +++++++++++-------- .../sync/SerializationHelperWithPool.java | 33 +++++++++++-------- .../dclare/sync/SocketSyncConnection.java | 33 +++++++++++-------- .../dclare/sync/SupplierAndConsumer.java | 33 +++++++++++-------- .../dclare/sync/SyncConnectionHandler.java | 33 +++++++++++-------- .../dclare/sync/UniverseSynchronizer.java | 33 +++++++++++-------- .../org/modelingvalue/dclare/sync/Util.java | 33 +++++++++++-------- .../modelingvalue/dclare/sync/WorkDaemon.java | 33 +++++++++++-------- .../dclare/test/CommunicationTests.java | 33 +++++++++++-------- .../dclare/test/DclareTests.java | 33 +++++++++++-------- .../dclare/test/JsonICTests.java | 33 +++++++++++-------- .../dclare/test/NewableTests.java | 33 +++++++++++-------- .../dclare/test/SerialisationPoolTests.java | 33 +++++++++++-------- .../test/support/CommunicationHelper.java | 33 +++++++++++-------- .../test/support/CommunicationPeer.java | 33 +++++++++++-------- .../dclare/test/support/Fibonacci.java | 33 +++++++++++-------- .../dclare/test/support/ModelMaker.java | 33 +++++++++++-------- .../dclare/test/support/OneShotTests.java | 33 +++++++++++-------- .../dclare/test/support/PeerTester.java | 33 +++++++++++-------- .../dclare/test/support/Shared.java | 33 +++++++++++-------- .../dclare/test/support/TestDeltaAdaptor.java | 33 +++++++++++-------- .../dclare/test/support/TestMutable.java | 33 +++++++++++-------- .../dclare/test/support/TestMutableClass.java | 33 +++++++++++-------- .../dclare/test/support/TestNewable.java | 33 +++++++++++-------- .../dclare/test/support/TestNewableClass.java | 33 +++++++++++-------- .../dclare/test/support/TestObserved.java | 33 +++++++++++-------- .../dclare/test/support/TestScheduler.java | 33 +++++++++++-------- .../dclare/test/support/TestUniverse.java | 33 +++++++++++-------- 109 files changed, 2071 insertions(+), 1526 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1d2e354a..ea7e9c02 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,17 +1,22 @@ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -## ~ -## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -## specific language governing permissions and limitations under the License. ~ -## ~ -## Maintainers: ~ -## Wim Bast, Tom Brus, Ronald Krijgsheld ~ -## Contributors: ~ -## Arjan Kok, Carel Bast ~ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## ~ +## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +## specific language governing permissions and limitations under the License. ~ +## ~ +## Maintainers: ~ +## Wim Bast, Tom Brus ~ +## ~ +## Contributors: ~ +## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +## --------------------------------------------------------------------------------------------------------------------- ~ +## In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +## but also our friend. "He will live on in many of the lines of code you see below." ~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ version: 2 updates: diff --git a/build.gradle.kts b/build.gradle.kts index 8773cd2b..02f98aa6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ defaultTasks("mvgCorrector", "test", "publish", "mvgTagger") diff --git a/gradle.properties b/gradle.properties index aa9d9a22..56b71b4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,22 @@ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -## ~ -## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -## specific language governing permissions and limitations under the License. ~ -## ~ -## Maintainers: ~ -## Wim Bast, Tom Brus, Ronald Krijgsheld ~ -## Contributors: ~ -## Arjan Kok, Carel Bast ~ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## ~ +## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +## specific language governing permissions and limitations under the License. ~ +## ~ +## Maintainers: ~ +## Wim Bast, Tom Brus ~ +## ~ +## Contributors: ~ +## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +## --------------------------------------------------------------------------------------------------------------------- ~ +## In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +## but also our friend. "He will live on in many of the lines of code you see below." ~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # suppress inspection "UnusedProperty" for whole file group = org.modelingvalue diff --git a/settings.gradle.kts b/settings.gradle.kts index 503d097e..eb29d1af 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ rootProject.name = "dclare" diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index d1fcdd4e..aece1320 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index 036f1fa9..8b3d981f 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ActionInstance.java b/src/main/java/org/modelingvalue/dclare/ActionInstance.java index bc3ead64..293c4150 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ActionInstance.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 1b18eca3..00df861a 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 9c736d7b..2e37c61b 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 92221350..61854bef 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Construction.java b/src/main/java/org/modelingvalue/dclare/Construction.java index e6bfb497..eaad3d90 100644 --- a/src/main/java/org/modelingvalue/dclare/Construction.java +++ b/src/main/java/org/modelingvalue/dclare/Construction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java index 018cb5ff..a9803059 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/DclareConfig.java b/src/main/java/org/modelingvalue/dclare/DclareConfig.java index 28f56f63..5d741b29 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareConfig.java +++ b/src/main/java/org/modelingvalue/dclare/DclareConfig.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/DclareTrace.java b/src/main/java/org/modelingvalue/dclare/DclareTrace.java index 821d5d31..b126c564 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareTrace.java +++ b/src/main/java/org/modelingvalue/dclare/DclareTrace.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Derivation.java b/src/main/java/org/modelingvalue/dclare/Derivation.java index 34ee88b5..d58aaa65 100644 --- a/src/main/java/org/modelingvalue/dclare/Derivation.java +++ b/src/main/java/org/modelingvalue/dclare/Derivation.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java index 394977cc..006ec7ae 100644 --- a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Direction.java b/src/main/java/org/modelingvalue/dclare/Direction.java index 88229a1a..91e1ad60 100644 --- a/src/main/java/org/modelingvalue/dclare/Direction.java +++ b/src/main/java/org/modelingvalue/dclare/Direction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Feature.java b/src/main/java/org/modelingvalue/dclare/Feature.java index 497b5e7e..a4bb3ebf 100644 --- a/src/main/java/org/modelingvalue/dclare/Feature.java +++ b/src/main/java/org/modelingvalue/dclare/Feature.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java index 31df231c..d0c8a2f3 100644 --- a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java +++ b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java index 63689b9f..81e707d0 100644 --- a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Getable.java b/src/main/java/org/modelingvalue/dclare/Getable.java index 7b46c6c0..07a5055d 100644 --- a/src/main/java/org/modelingvalue/dclare/Getable.java +++ b/src/main/java/org/modelingvalue/dclare/Getable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/IState.java b/src/main/java/org/modelingvalue/dclare/IState.java index 153a8617..61e85971 100644 --- a/src/main/java/org/modelingvalue/dclare/IState.java +++ b/src/main/java/org/modelingvalue/dclare/IState.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java index b099e5cc..301b6755 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index da89bfa0..3c6c1710 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Imperative.java b/src/main/java/org/modelingvalue/dclare/Imperative.java index 0092578a..6c41732e 100644 --- a/src/main/java/org/modelingvalue/dclare/Imperative.java +++ b/src/main/java/org/modelingvalue/dclare/Imperative.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 68974869..49528869 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/JsonToState.java b/src/main/java/org/modelingvalue/dclare/JsonToState.java index 6dbeb6e6..d5c7c456 100644 --- a/src/main/java/org/modelingvalue/dclare/JsonToState.java +++ b/src/main/java/org/modelingvalue/dclare/JsonToState.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java index 787a1373..374d621a 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index 0e092b3e..430c9001 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 7a46032e..6824c1a8 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/LeafModifier.java b/src/main/java/org/modelingvalue/dclare/LeafModifier.java index 864ecc8e..9b6f1e6e 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/LeafModifier.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index d807be84..9cb29a3a 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 04428886..1707e3e3 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 61c32624..1f648932 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/MutableClass.java b/src/main/java/org/modelingvalue/dclare/MutableClass.java index 8cbf535f..5ab550e0 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableClass.java +++ b/src/main/java/org/modelingvalue/dclare/MutableClass.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index c4a7cb46..7a278a66 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index b7e45d1f..f3e9fedd 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Newable.java b/src/main/java/org/modelingvalue/dclare/Newable.java index c255c678..03efced2 100644 --- a/src/main/java/org/modelingvalue/dclare/Newable.java +++ b/src/main/java/org/modelingvalue/dclare/Newable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 5b5ac2f4..2cf9a0d8 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java index 75950c82..820d8fcc 100644 --- a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index 0c5875ed..2b60e3df 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java index 3431686f..a9785839 100644 --- a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index 1d720412..1ea5fea6 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 159d90e3..6c2eb57c 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index a3ea1e8a..922ae951 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 543d93c5..33886679 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Priority.java b/src/main/java/org/modelingvalue/dclare/Priority.java index db664b78..494c6f2b 100644 --- a/src/main/java/org/modelingvalue/dclare/Priority.java +++ b/src/main/java/org/modelingvalue/dclare/Priority.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnly.java b/src/main/java/org/modelingvalue/dclare/ReadOnly.java index 66438262..3f0a17b2 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnly.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnly.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 17c8c845..d3edbd47 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java index 838ed27a..83835dbf 100644 --- a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index c63711f3..44a3712f 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/SetableModifier.java b/src/main/java/org/modelingvalue/dclare/SetableModifier.java index 98d249af..7a37b47e 100644 --- a/src/main/java/org/modelingvalue/dclare/SetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/SetableModifier.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 13a37c9f..d0b67a3a 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java index 8579449c..aa1a7982 100644 --- a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/StateMap.java b/src/main/java/org/modelingvalue/dclare/StateMap.java index 7626b1dc..c3a10042 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMap.java +++ b/src/main/java/org/modelingvalue/dclare/StateMap.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java index 4bbbc22e..dbdae609 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index 4a470017..294a9096 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/This.java b/src/main/java/org/modelingvalue/dclare/This.java index 098c4044..c7ba7141 100644 --- a/src/main/java/org/modelingvalue/dclare/This.java +++ b/src/main/java/org/modelingvalue/dclare/This.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Transaction.java b/src/main/java/org/modelingvalue/dclare/Transaction.java index aab74a2b..c6fad5dc 100644 --- a/src/main/java/org/modelingvalue/dclare/Transaction.java +++ b/src/main/java/org/modelingvalue/dclare/Transaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/TransactionClass.java b/src/main/java/org/modelingvalue/dclare/TransactionClass.java index d95ce488..ebe6453a 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionClass.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionClass.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/TransactionId.java b/src/main/java/org/modelingvalue/dclare/TransactionId.java index 664d6a81..7f70acf5 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionId.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionId.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java index 92913971..2a344061 100644 --- a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java +++ b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index eb632e5d..01b89e30 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java index a280c655..7f10f98e 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 0e25a158..fcc76998 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare; diff --git a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java index 13059ef8..06db1e62 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java index fe22b2d9..8946f850 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java index 59ca0b28..24c94828 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java index c314b51f..c2da64c4 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java index b2cbe19f..7f91eab1 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java index 44e86a10..00c234b5 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java index 5546929a..81e83df3 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java index f9ed913f..d999e1e7 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java index ba872ce0..a7f86b8a 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java index 72b5fbb7..8f3a8891 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java index 107e6cd9..300f3684 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java index df231e41..9312f5d0 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.ex; diff --git a/src/main/java/org/modelingvalue/dclare/sync/Converters.java b/src/main/java/org/modelingvalue/dclare/sync/Converters.java index 0e0fb0bf..40126939 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Converters.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Converters.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index 3c6f079a..5c023de8 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java index 1d91a832..850c846c 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java +++ b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java index 298e7d5e..3bc58659 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java index 4359df54..4824d3e2 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java index 6b857dd9..51d88799 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java index 0f6b5ad0..cbc55e8a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java index a40aa692..5bb854c9 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java index 3d323823..e6708865 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java index 8995977c..775b7b55 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/Util.java b/src/main/java/org/modelingvalue/dclare/sync/Util.java index bc053b7a..86d8c59a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Util.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Util.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java index 81e02c36..e19ce203 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java +++ b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.sync; diff --git a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java index 8042a15d..6615d359 100644 --- a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test; diff --git a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java index a8251f78..c66b7209 100644 --- a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test; diff --git a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java index 94151483..ff314448 100644 --- a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test; diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index 4b0650a8..a8fe7561 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test; diff --git a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java index 89c3728e..e0fee763 100644 --- a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java index 1164d187..9407541b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java index b54f7fe6..a2bd6aff 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java index cfcb22da..8c6812a8 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index 1fa3b7a9..ce613f90 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java index 7fe62d3a..200cc17a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java index 6196f360..f828e143 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java index 13f15148..d2361a59 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java index ead81301..af432bf7 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java index d0b1af6e..36d6340a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java index dc34f553..b9f25ed5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java index 71f65057..77a3e886 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java index 33d54936..a655b961 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java index 33ecf2f1..eb9dcce1 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java index 1ebfe3e0..e6a7f026 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java index da862794..8b7fa03c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.dclare.test.support; From c49808b8918ef9253ab3b8d9cc377645c43b441e Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 9 Feb 2024 14:29:39 +0100 Subject: [PATCH 023/179] extra check on deriveValue --- .../org/modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index aece1320..433712f6 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -184,7 +184,7 @@ public T set(O object, Setable setable, T post) { if (doDeriveSet(object, setable)) { Observed observed = (Observed) setable; DerivedValue derivedValue = DERIVED_VALUE.get(); - boolean isDerived = derivedValue.isDerived(object, observed); + boolean isDerived = derivedValue != null && derivedValue.isDerived(object, observed); ConstantState mem = memoization(object); Constant constant = observed.constant(); T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(this, object, constant) ? mem.get(this, object, constant) : getNonDerived(object, setable); From da895b1d37a8d0fd352896700bfd5b6f3d8b5967 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 20 Feb 2024 17:10:40 +0100 Subject: [PATCH 024/179] matching observeds --- .../dclare/CoreSetableModifier.java | 3 +- .../org/modelingvalue/dclare/MatchInfo.java | 4 +- .../org/modelingvalue/dclare/Observed.java | 6 +++ .../dclare/ObserverTransaction.java | 2 +- .../dclare/test/NewableTests.java | 41 +++++++------------ 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java index a9803059..a7550995 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java @@ -30,5 +30,6 @@ public enum CoreSetableModifier implements SetableModifier> { doNotMerge, orphansAllowed, preserved, - doNotClear; + doNotClear, + match; } diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 1707e3e3..905c1e59 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -35,6 +35,7 @@ public class MatchInfo { private final Object identity; private final boolean containment; private final boolean many; + private final boolean match; private QualifiedSet allDerivations; @@ -47,6 +48,7 @@ public static MatchInfo of(Newable newable, ObserverTransaction otx, Mutable obj private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Observed observed, boolean many) { this.newable = newable; this.containment = observed.containment(); + this.match = observed.match(); this.many = many; ConstantState constants = otx.universeTransaction().tmpConstants(); removed = otx.startState(Priority.three).get(newable, Mutable.D_PARENT_CONTAINING) == null && // @@ -67,7 +69,7 @@ private MatchInfo(Newable newable, ObserverTransaction otx, Mutable object, Obse } public boolean mustReplace(MatchInfo replaced) { - if (!many || containment) { + if (!many || containment || match) { return canBeReplacing() && replaced.canBeReplaced() && Objects.equals(identity(), replaced.identity()) && // !replaced.allDerivations.anyMatch(c -> (isDerived() && initialConstruction.reason().equals(c.reason())) || c.hasSource(newable)); } else { diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index 2b60e3df..c554bb2c 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -80,6 +80,7 @@ public static Observed of(Object id, Function def, Supplier> readers = Setable.of(Pair.of(this, "readers"), Set.of()); private final Setable> writers = Setable.of(Pair.of(this, "writers"), Set.of()); private final boolean mandatory; + private final boolean match; private final Observers observers; @SuppressWarnings("rawtypes") private final Entry> thisInstance = Entry.of(this, Mutable.THIS_SINGLETON); @@ -88,6 +89,7 @@ public static Observed of(Object id, Function def, Supplier def, Supplier> opposite, Supplier>> scope, QuadConsumer changed, SetableModifier... modifiers) { super(id, def, opposite, scope, changed, modifiers); this.mandatory = hasModifier(CoreSetableModifier.mandatory); + this.match = hasModifier(CoreSetableModifier.match); this.observers = new Observers<>(this); } @@ -112,6 +114,10 @@ public boolean mandatory() { return mandatory; } + public boolean match() { + return match; + } + public Setable> readers() { return readers; } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 922ae951..9d43143f 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -223,7 +223,7 @@ protected void trace(State pre, DefaultMap> observeds) { private ObserverTrace trace(State pre, DefaultMap> observeds, Setable> setable) { List traces = setable.get(mutable()); Pair> p = Mutable.D_PARENT_CONTAINING.get(mutable()); - if (p.b() instanceof Observed) { + if (p != null && p.b() instanceof Observed) { observeds = observeds.put((Observed) p.b(), observeds.get((Observed) p.b()).add(p.a())); } ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), nrOfChanges, // diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index a8fe7561..5886bbe5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -20,6 +20,17 @@ package org.modelingvalue.dclare.test; +import static org.junit.jupiter.api.Assertions.*; +import static org.modelingvalue.dclare.CoreSetableModifier.*; +import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; +import static org.modelingvalue.dclare.test.support.TestNewable.create; +import static org.modelingvalue.dclare.test.support.TestNewable.n; + +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.RepetitionInfo; import org.junit.jupiter.api.Test; @@ -33,15 +44,7 @@ import org.modelingvalue.collections.util.Concurrent; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.StatusProvider.StatusIterator; -import org.modelingvalue.dclare.DclareConfig; -import org.modelingvalue.dclare.Direction; -import org.modelingvalue.dclare.LeafTransaction; -import org.modelingvalue.dclare.Newable; -import org.modelingvalue.dclare.Observed; -import org.modelingvalue.dclare.Setable; -import org.modelingvalue.dclare.State; -import org.modelingvalue.dclare.Universe; -import org.modelingvalue.dclare.UniverseTransaction; +import org.modelingvalue.dclare.*; import org.modelingvalue.dclare.UniverseTransaction.Status; import org.modelingvalue.dclare.test.support.TestMutable; import org.modelingvalue.dclare.test.support.TestMutableClass; @@ -49,22 +52,6 @@ import org.modelingvalue.dclare.test.support.TestNewableClass; import org.modelingvalue.dclare.test.support.TestUniverse; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.modelingvalue.dclare.CoreSetableModifier.containment; -import static org.modelingvalue.dclare.CoreSetableModifier.mandatory; -import static org.modelingvalue.dclare.CoreSetableModifier.symmetricOpposite; -import static org.modelingvalue.dclare.CoreSetableModifier.synthetic; -import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; -import static org.modelingvalue.dclare.test.support.TestNewable.create; -import static org.modelingvalue.dclare.test.support.TestNewable.n; - @SuppressWarnings("OptionalGetWithoutIsPresent") public class NewableTests { @@ -144,10 +131,10 @@ public State bidirectional(DclareConfig config) { U.observe(cs, u -> { List bs = cs.get(u).filter(B::isInstance).asList(); - return Collection.concat(bs.map(ar::get), bs).asList(); + return Collection.concat(bs.map(ar::get), bs).requireNonNull().asList(); }, b2a).observe(cs, u -> { List as = cs.get(u).filter(A::isInstance).asList(); - return Collection.concat(as, as.map(br::get)).asList(); + return Collection.concat(as, as.map(br::get)).requireNonNull().asList(); }, a2b); A.observe(br, a -> create(B, x -> x.// From 23d3bb2ff81cba1dfa9cfa3af780c21841a9d2a0 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Fri, 23 Feb 2024 10:13:53 +0100 Subject: [PATCH 025/179] add timing on Actions --- .../java/org/modelingvalue/dclare/Action.java | 8 ++++- .../org/modelingvalue/dclare/OneShot.java | 36 +++++++++++-------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index 8b3d981f..3732d3ff 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -37,6 +37,7 @@ public static Action of(Object id, Consumer action, Le private final Direction direction; private final boolean preserved; private final boolean read; + private long durationNano = -1; protected Action(Object id, Consumer action, LeafModifier... modifiers) { super(id, modifiers); @@ -44,7 +45,7 @@ protected Action(Object id, Consumer action, LeafModifier... modifiers) { Direction dir = getModifier(Direction.class); this.direction = dir == null ? Direction.DEFAULT : dir; this.preserved = hasModifier(LeafModifier.preserved); - this.read = hasModifier(LeafModifier.read); + this.read = hasModifier(LeafModifier.read); } @Override @@ -58,7 +59,9 @@ public void closeTransaction(Transaction tx) { } public void run(O object) { + long t0 = System.nanoTime(); action.accept(object); + durationNano = System.nanoTime() - t0; } public void trigger(O mutable) { @@ -95,4 +98,7 @@ public boolean read() { return read; } + public long durationNano() { + return durationNano; + } } diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 33886679..9fd070ee 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -20,14 +20,6 @@ package org.modelingvalue.dclare; -import org.modelingvalue.collections.Collection; -import org.modelingvalue.collections.List; -import org.modelingvalue.collections.Map; -import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.util.ContextThread; -import org.modelingvalue.collections.util.ContextPool; -import org.modelingvalue.collections.util.MutationWrapper; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -46,6 +38,14 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.List; +import org.modelingvalue.collections.Map; +import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.util.ContextPool; +import org.modelingvalue.collections.util.ContextThread; +import org.modelingvalue.collections.util.MutationWrapper; + /** * This class will enable you to build a model in a dclare universe and then finish. * All methods marked with {@link OneShotAction} will be executed in alphabetical order. @@ -75,7 +75,6 @@ public abstract class OneShot { boolean caching() default false; } - @SuppressWarnings("DataFlowIssue") public OneShot(U universe) { this.universe = universe; @@ -133,7 +132,6 @@ public void clearCache() { * * @return the end state */ - @SuppressWarnings("DataFlowIssue") public State getEndState() { if (endState != null) { return endState; @@ -145,13 +143,13 @@ public State getEndState() { StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); boolean runningFromCache = cachedStateMap != null; UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, getConfig(), null, cachedStateMap); - long t0 = System.currentTimeMillis(); + long t0 = System.nanoTime(); List allActions = getAllActions(runningFromCache); trace("START", "#actions=%d", allActions.size()); allActions.forEach(a -> a.putAndWaitForIdle(universeTransaction)); universeTransaction.stop(); endState = universeTransaction.waitForEnd(); - trace("DONE", "duration=%5d ms", System.currentTimeMillis() - t0); + trace("DONE", "duration=%5d ms", nano2ms(System.nanoTime() - t0)); } finally { doneWithContextPool(contextPool); } @@ -188,7 +186,7 @@ protected MyAction(Method method, boolean runningFromCache) { } protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { - long t00 = System.currentTimeMillis(); + long t0 = System.nanoTime(); boolean writeResultToCache = isCachingMethod && !runningFromCache; boolean skip = isCachingMethod && runningFromCache; if (skip) { @@ -197,11 +195,17 @@ protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { trace(" >>ACTION", "%s", id()); State intermediateState = universeTransaction.putAndWaitForIdle(this); traceDiff(intermediateState); - trace(" < a.computeIfAbsent(cacheKey, __ -> intermediateState.getStateMap())); } + long overallNano = System.nanoTime() - t0; + long methodNano = durationNano(); + long dtOverall = nano2ms(overallNano); + long dtMethod = nano2ms(methodNano); + long dtRules = nano2ms(overallNano - methodNano); + trace(" < Date: Fri, 23 Feb 2024 11:04:58 +0100 Subject: [PATCH 026/179] add timing on Actions --- src/main/java/org/modelingvalue/dclare/OneShot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 9fd070ee..e6fb9c44 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -205,7 +205,7 @@ protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { long dtOverall = nano2ms(overallNano); long dtMethod = nano2ms(methodNano); long dtRules = nano2ms(overallNano - methodNano); - trace(" < Date: Tue, 27 Feb 2024 14:30:46 +0100 Subject: [PATCH 027/179] less deduplication --- src/main/java/org/modelingvalue/dclare/State.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index d0b67a3a..0d0ca072 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -200,7 +200,9 @@ public State merge(StateMergeHandler changeHandler, State[] branches, int length if (changeHandler != null) { for (Entry p : props) { if (p != ps.getEntry(p.getKey())) { - deduplicate(p); + if (p.getKey().deduplicate(p.getValue())) { + deduplicate(p); + } changeHandler.handleChange(o, p.getKey(), ps, pss, props, this); } } From 4b389f88714eee648e2766d0c73460897e222310 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 27 Feb 2024 16:10:50 +0100 Subject: [PATCH 028/179] Merge branch 'develop' of https://github.com/ModelingValueGroup/dclare.git into develop --- src/main/java/org/modelingvalue/dclare/ConstantState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 61854bef..13349a95 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -328,7 +328,7 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, Constants constants = prev.get(object); if (constants == null) { Set allWithEqualhash = prev.allWithEqualhash(object); - if (allWithEqualhash.size() >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL - 2) { + while (allWithEqualhash.size() >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL - 4) { int i = 0; for (Constants c : allWithEqualhash) { if (!(c.ref instanceof Constants.DurableRef)) { @@ -338,6 +338,7 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, } } } + allWithEqualhash = prev.allWithEqualhash(object); } object = leafTransaction.state().canonical(object); constants = new Constants<>(object, referenceType, queue); From 2f3db7eb5091c3bf289cb4adf2b1773bd044d2c2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 27 Feb 2024 16:35:26 +0100 Subject: [PATCH 029/179] prune equal hashes --- .../modelingvalue/dclare/ConstantState.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 13349a95..d9440eb7 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -327,21 +327,9 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, QualifiedSet prev = state.get(); Constants constants = prev.get(object); if (constants == null) { - Set allWithEqualhash = prev.allWithEqualhash(object); - while (allWithEqualhash.size() >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL - 4) { - int i = 0; - for (Constants c : allWithEqualhash) { - if (!(c.ref instanceof Constants.DurableRef)) { - prev = removeConstants(c); - if (++i >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL / 2) { - break; - } - } - } - allWithEqualhash = prev.allWithEqualhash(object); - } object = leafTransaction.state().canonical(object); constants = new Constants<>(object, referenceType, queue); + prev = pruneEqualHashes(object, prev); QualifiedSet next = prev.add(constants); Constants now; while (!state.compareAndSet(prev, next)) { @@ -354,6 +342,7 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, } return now; } + prev = pruneEqualHashes(object, prev); next = prev.add(constants); } } else if (referenceType.strongness > constants.referenceType().strongness) { @@ -362,6 +351,23 @@ private Constants getConstants(LeafTransaction leafTransaction, O object, return constants; } + private QualifiedSet pruneEqualHashes(O object, QualifiedSet prev) { + Set allWithEqualhash = prev.allWithEqualhash(object); + while (allWithEqualhash.size() >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL - 4) { + int i = 0; + for (Constants c : allWithEqualhash) { + if (!(c.ref instanceof Constants.DurableRef)) { + prev = removeConstants(c); + if (++i >= HashCollectionImpl.EQUAL_HASHCODE_WARNING_LEVEL / 2) { + break; + } + } + } + allWithEqualhash = prev.allWithEqualhash(object); + } + return prev; + } + private QualifiedSet removeConstants(Constants constants) { QualifiedSet prev = state.get(); Object object = constants.object(); From e0a18284105964f0e0f6dcd92506a2cce0d2ca93 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 28 Feb 2024 11:30:57 +0100 Subject: [PATCH 030/179] NO_DEDUPLICATION flag --- .../org/modelingvalue/dclare/Mutable.java | 7 ++-- .../org/modelingvalue/dclare/Observed.java | 16 ++++++---- .../org/modelingvalue/dclare/Observer.java | 32 ++++++++++--------- .../org/modelingvalue/dclare/Setable.java | 3 +- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 1f648932..4bb13c5a 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -20,10 +20,7 @@ package org.modelingvalue.dclare; -import static org.modelingvalue.dclare.CoreSetableModifier.doNotMerge; -import static org.modelingvalue.dclare.CoreSetableModifier.durable; -import static org.modelingvalue.dclare.CoreSetableModifier.plumbing; -import static org.modelingvalue.dclare.CoreSetableModifier.preserved; +import static org.modelingvalue.dclare.CoreSetableModifier.*; import java.util.function.Predicate; @@ -43,6 +40,8 @@ public interface Mutable extends TransactionClass { Set THIS_SINGLETON = Set.of(THIS); + Constant> SINGLETON = Constant.of("$SINGLETON", Set::of); + @SuppressWarnings("rawtypes") ParentContaining D_PARENT_CONTAINING = new ParentContaining("D_PARENT_CONTAINING", plumbing, preserved); diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index c554bb2c..e6c11ea4 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -77,13 +77,15 @@ public static Observed of(Object id, Function def, Supplier(id, def, opposite, scope, null, modifiers); } - private final Setable> readers = Setable.of(Pair.of(this, "readers"), Set.of()); - private final Setable> writers = Setable.of(Pair.of(this, "writers"), Set.of()); - private final boolean mandatory; - private final boolean match; - private final Observers observers; + private final Setable> readers = Setable.of(Pair.of(this, "readers"), Set.of()); + private final Setable> writers = Setable.of(Pair.of(this, "writers"), Set.of()); + private final boolean mandatory; + private final boolean match; + private final Observers observers; @SuppressWarnings("rawtypes") - private final Entry> thisInstance = Entry.of(this, Mutable.THIS_SINGLETON); + private final Entry> thisInstance = Entry.of(this, Mutable.THIS_SINGLETON); + @SuppressWarnings("rawtypes") + private final Constant>> entry = Constant.of(Pair.of(this, "entry"), m -> Entry.of(this, Mutable.SINGLETON.get(m))); @SuppressWarnings({"unchecked", "rawtypes"}) protected Observed(Object id, Function def, Supplier> opposite, Supplier>> scope, QuadConsumer changed, SetableModifier... modifiers) { @@ -154,7 +156,7 @@ public String toString() { @SuppressWarnings("rawtypes") protected Entry> entry(Mutable object, Mutable self) { - return object.equals(self) ? thisInstance : Entry.of(this, Set.of(object)); + return object.equals(self) ? thisInstance : entry.get(object); } @Override diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index 1ea5fea6..a745fe95 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -70,24 +70,26 @@ public static Observer of(Object id, Setable set return new Observer(id, setable, predicate, value, modifiers); } - private final Traces traces; - private final Debugs debugs; - private final ExceptionSetable exception; - private final Observerds observeds; - private final Constructed constructed; + private final Traces traces; + private final Debugs debugs; + private final ExceptionSetable exception; + private final Observerds observeds; + private final Constructed constructed; @SuppressWarnings("rawtypes") - private final Set> targets; - private final boolean anonymous; - private final boolean atomic; + private final Set> targets; + private final boolean anonymous; + private final boolean atomic; - private long runCount = -1; - private int instances; - private int changes; - private boolean stopped; - private boolean trace; + private long runCount = -1; + private int instances; + private int changes; + private boolean stopped; + private boolean trace; @SuppressWarnings("rawtypes") - private final Entry> thisInstance = Entry.of(this, Mutable.THIS_SINGLETON); + private final Entry> thisInstance = Entry.of(this, Mutable.THIS_SINGLETON); + @SuppressWarnings("rawtypes") + private final Constant>> entry = Constant.of(Pair.of(this, "entry"), m -> Entry.of(this, Mutable.SINGLETON.get(m))); protected Observer(Object id, Consumer action, LeafModifier... modifiers) { this(id, action, Set.of(), modifiers); @@ -383,7 +385,7 @@ public String toString() { @SuppressWarnings("rawtypes") private Entry entry(Mutable object, Mutable self) { - return object.equals(self) ? thisInstance : Entry.of(this, Set.of(object)); + return object.equals(self) ? thisInstance : entry.get(object); } @SuppressWarnings("rawtypes") diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index 44a3712f..9b947f95 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -44,6 +44,7 @@ public class Setable extends Getable { private static final boolean DANGER_ALWAYS_ALLOW_ORPHANS = Boolean.getBoolean("DANGER_ALWAYS_ALLOW_ORPHANS"); + private static final boolean NO_DEDUPLICATION = Boolean.getBoolean("NO_DEDUPLICATION"); private static final Context MOVING = Context.of(false); @@ -154,7 +155,7 @@ protected Entry entry(T value, DefaultMap prop } protected boolean deduplicate(T value) { - return value instanceof ContainingCollection; + return !NO_DEDUPLICATION && value instanceof ContainingCollection; } public Direction direction() { From 6f7fef283bd83b5f6fe6f8141d3bc69db00ef9de Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 4 Mar 2024 14:12:49 +0100 Subject: [PATCH 031/179] push / pull support --- .../dclare/AbstractDerivationTransaction.java | 70 +++++----- .../dclare/ActionTransaction.java | 49 +++++-- .../dclare/ConstantChangeHandler.java | 11 ++ .../modelingvalue/dclare/ConstantState.java | 50 ++++---- .../dclare/IdentityDerivationTransaction.java | 6 +- .../dclare/LazyDerivationTransaction.java | 10 +- .../modelingvalue/dclare/LeafTransaction.java | 9 +- .../org/modelingvalue/dclare/Mutable.java | 13 ++ .../dclare/MutableTransaction.java | 75 +++++------ .../dclare/ObserverTransaction.java | 4 +- .../org/modelingvalue/dclare/OneShot.java | 120 ++++++++---------- .../dclare/ReadOnlyTransaction.java | 2 +- .../org/modelingvalue/dclare/Setable.java | 21 ++- .../java/org/modelingvalue/dclare/State.java | 13 +- .../org/modelingvalue/dclare/Transaction.java | 8 ++ .../org/modelingvalue/dclare/Universe.java | 14 +- .../dclare/UniverseTransaction.java | 36 ++++-- .../dclare/ex/NotYetDerivableException.java | 5 + .../dclare/test/support/OneShotTests.java | 58 ++++----- 19 files changed, 333 insertions(+), 241 deletions(-) create mode 100644 src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java create mode 100644 src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 433712f6..7617bb10 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -40,7 +40,6 @@ public abstract class AbstractDerivationTransaction extends ReadOnlyTransaction protected static final Context> DERIVER = Context.of(null); @SuppressWarnings("rawtypes") private static final Context DERIVED_VALUE = Context.of(null); - private static final Context DERIVE = Context.of(true); private static final Context INDENT = Context.of(0); public static boolean isDeriving() { @@ -51,10 +50,12 @@ protected AbstractDerivationTransaction(UniverseTransaction universeTransaction) super(universeTransaction); } - private ConstantState memoization; + private ConstantState memoization; + private ConstantChangeHandler changeHandler; - public R derive(Supplier action, State state, ConstantState memoization) { + public R derive(Supplier action, State state, ConstantState memoization, ConstantChangeHandler changeHandler) { this.memoization = memoization; + this.changeHandler = changeHandler; try { return get(action, state); } catch (Throwable t) { @@ -62,17 +63,13 @@ public R derive(Supplier action, State state, ConstantState memoization) return null; } finally { this.memoization = null; + this.changeHandler = null; } } @SuppressWarnings("rawtypes") - protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { - return doDeriveSet(object, getable); - } - - @SuppressWarnings("rawtypes") - protected boolean doDeriveSet(O object, Getable getable) { - return object instanceof Mutable && getable instanceof Observed && DERIVE.get(); + protected boolean doDerive(O object, Getable getable, T nonDerived) { + return object instanceof Mutable && getable instanceof Observed; } protected T getNonDerived(O object, Getable getable) { @@ -93,7 +90,7 @@ protected T current(O object, Getable getable) { @SuppressWarnings({"rawtypes", "unchecked"}) private T derive(O object, Getable getable, T nonDerived) { - if (doDeriveGet(object, getable, nonDerived)) { + if (doDerive(object, getable, nonDerived)) { Observed observed = (Observed) getable; DerivedValue outerDerivedValue = DERIVED_VALUE.get(); boolean isDerived = outerDerivedValue != null && outerDerivedValue.isDerived(object, observed); @@ -101,7 +98,7 @@ private T derive(O object, Getable getable, T nonDerived) { Constant constant = observed.constant(); if (isDerived && outerDerivedValue.isSet()) { return outerDerivedValue.get(); - } else if (!mem.isSet(this, object, constant)) { + } else if (!mem.isSet(changeHandler, object, constant)) { if (Newable.D_ALL_DERIVATIONS.equals(observed) || Mutable.D_PARENT_CONTAINING.equals(observed)) { return nonDerived; } else { @@ -128,10 +125,10 @@ private T derive(O object, Getable getable, T nonDerived) { runDeriver((Mutable) object, observed, observer, ++i); } if (innerDerivedValue.isSet()) { - setInMemoization(mem, object, observed, innerDerivedValue.get()); + setInMemoization(mem, object, observed, innerDerivedValue.get(), false); } }))); - if (!mem.isSet(this, object, constant)) { + if (!mem.isSet(changeHandler, object, constant)) { if (isTraceDerivation(object, observed)) { INDENT.run(INDENT.get() + 1, () -> runNonDeriving(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); } @@ -140,7 +137,7 @@ private T derive(O object, Getable getable, T nonDerived) { } } } - return mem.get(this, object, constant); + return mem.get(changeHandler, object, constant); } else { return nonDerived; } @@ -166,33 +163,40 @@ protected void runDeriver(Mutable mutable, Observed observed, Observer observer, @Override public T set(O object, Setable setable, BiFunction function, E element) { - return set(object, setable, function.apply(getNonDerived(object, setable), element)); + T nonDerived = getNonDerived(object, setable); + return set(object, setable, function.apply(nonDerived, element), nonDerived); } @Override public T set(O object, Setable setable, UnaryOperator oper) { - return set(object, setable, oper.apply(getNonDerived(object, setable))); + T nonDerived = getNonDerived(object, setable); + return set(object, setable, oper.apply(nonDerived), nonDerived); + } + + @Override + public T set(O object, Setable setable, T post) { + T nonDerived = getNonDerived(object, setable); + return set(object, setable, post, nonDerived); } public void runNonDeriving(Runnable action) { - DERIVE.run(false, action); + DERIVED.run(Set.of(), action); } @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public T set(O object, Setable setable, T post) { - if (doDeriveSet(object, setable)) { + private T set(O object, Setable setable, T post, T nonDerived) { + if (doDerive(object, setable, nonDerived) && isDeriving()) { Observed observed = (Observed) setable; DerivedValue derivedValue = DERIVED_VALUE.get(); boolean isDerived = derivedValue != null && derivedValue.isDerived(object, observed); ConstantState mem = memoization(object); Constant constant = observed.constant(); - T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(this, object, constant) ? mem.get(this, object, constant) : getNonDerived(object, setable); + T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(changeHandler, object, constant) ? mem.get(changeHandler, object, constant) : nonDerived; T result = match(mem, observed, pre, post); if (isDerived) { derivedValue.set(result); } else { - setInMemoization(mem, object, observed, result); + setInMemoization(mem, object, observed, result, false); } if (isTraceDerivation(object, observed)) { runNonDeriving(() -> { @@ -202,13 +206,13 @@ public T set(O object, Setable setable, T post) { } if (observed.containment()) { Setable. diff(pre, result, added -> { - setInMemoization(mem, added, Mutable.D_PARENT_CONTAINING, Pair.of((Mutable) object, (Setable) observed)); + setInMemoization(mem, added, Mutable.D_PARENT_CONTAINING, Pair.of((Mutable) object, (Setable) observed), true); }, removed -> { }); } return pre; - } else if (!Objects.equals(getNonDerived(object, setable), post)) { - return super.set(object, setable, post); + } else if (!Objects.equals(nonDerived, post)) { + return changeHandler.set(object, setable, post); } else { return post; } @@ -221,21 +225,21 @@ private T match(ConstantState mem, Setable setable, T pre, T post) if (!pres.isEmpty()) { for (Newable po : posts) { Construction poInit = Mutable.D_INITIAL_CONSTRUCTION.get(po); - if (poInit.isDerived() && mem.isSet(this, po, Newable.D_ALL_DERIVATIONS.constant())) { + if (poInit.isDerived() && mem.isSet(changeHandler, po, Newable.D_ALL_DERIVATIONS.constant())) { for (Newable pr : pres) { Construction preInit = Mutable.D_INITIAL_CONSTRUCTION.get(pr); if (preInit.isDirect() && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { pres = pres.remove(pr); post = replace(post, po, pr); - setInMemoization(mem, pr, Mutable.D_ALL_DERIVATIONS, mem.get(this, po, Newable.D_ALL_DERIVATIONS.constant())); + setInMemoization(mem, pr, Mutable.D_ALL_DERIVATIONS, mem.get(changeHandler, po, Newable.D_ALL_DERIVATIONS.constant()), true); } } } else if (poInit.isDirect()) { for (Newable pr : pres) { Construction preInit = Mutable.D_INITIAL_CONSTRUCTION.get(pr); - if (preInit.isDerived() && mem.isSet(this, pr, Newable.D_ALL_DERIVATIONS.constant()) && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { + if (preInit.isDerived() && mem.isSet(changeHandler, pr, Newable.D_ALL_DERIVATIONS.constant()) && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { pres = pres.remove(pr); - setInMemoization(mem, po, Mutable.D_ALL_DERIVATIONS, mem.get(this, pr, Newable.D_ALL_DERIVATIONS.constant())); + setInMemoization(mem, po, Mutable.D_ALL_DERIVATIONS, mem.get(changeHandler, pr, Newable.D_ALL_DERIVATIONS.constant()), true); } } } @@ -266,13 +270,13 @@ public O construct(Reason reason, Supplier supplier) { Pair deriver = DERIVER.get(); O result = supplier.get(); Construction cons = Construction.of(deriver.a(), deriver.b(), reason); - setInMemoization(memoization(deriver.a()), result, Newable.D_ALL_DERIVATIONS, Newable.D_ALL_DERIVATIONS.getDefault(result).add(cons)); + setInMemoization(memoization(deriver.a()), result, Newable.D_ALL_DERIVATIONS, Newable.D_ALL_DERIVATIONS.getDefault(result).add(cons), true); Mutable.D_INITIAL_CONSTRUCTION.force(result, cons); return result; } - protected void setInMemoization(ConstantState mem, O object, Setable setable, T result) { - mem.set(this, object, setable.constant(), result, true); + protected void setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { + mem.set(changeHandler, object, setable.constant(), result, force); } protected ConstantState memoization(O object) { diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 00df861a..4ccf5ac5 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -23,6 +23,7 @@ import java.util.ConcurrentModificationException; import java.util.Objects; import java.util.function.BiFunction; +import java.util.function.Supplier; import java.util.function.UnaryOperator; import org.modelingvalue.collections.DefaultMap; @@ -38,9 +39,31 @@ import org.modelingvalue.dclare.ex.TransactionException; public class ActionTransaction extends LeafTransaction implements StateMergeHandler { - private final CurrentState currentState = new CurrentState(); - private State preState; - private State postState; + private final CurrentState currentState = new CurrentState(); + private final ConstantChangeHandler changeHandler = new ConstantChangeHandler() { + @Override + public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + ActionTransaction.this.set(object, setable, preValue, postValue); + } + + @Override + public State state() { + return ActionTransaction.this.state(); + } + + @Override + public T set(O object, Setable property, T post) { + return ActionTransaction.this.set(object, property, post); + } + }; + @SuppressWarnings("unchecked") + private final Supplier supplier = () -> { + ((Action) action()).run(mutable()); + return null; + }; + + private State preState; + private State postState; protected ActionTransaction(UniverseTransaction universeTransaction) { super(universeTransaction); @@ -52,7 +75,11 @@ public final Action action() { @SuppressWarnings("unchecked") protected void run(State pre, UniverseTransaction universeTransaction) { - ((Action) action()).run(mutable()); + if (push()) { + ((Action) action()).run(mutable()); + } else { + state().derive(supplier, constantState(), changeHandler); + } } @SuppressWarnings("rawtypes") @@ -162,13 +189,15 @@ protected void setState(State state) { @SuppressWarnings({"rawtypes", "unchecked", "RedundantSuppression"}) @Override - protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { super.changed(object, setable, preValue, rawPreValue, postValue); - if (setable.preserved()) { - setChanged(object, setable, postValue); - } - if (setable instanceof Observed && !Objects.equals(preValue, postValue)) { - trigger(object, (Observed) setable); + if (push()) { + if (setable.preserved()) { + setChanged(object, setable, postValue); + } + if (setable instanceof Observed && !Objects.equals(preValue, postValue)) { + trigger(object, (Observed) setable); + } } } diff --git a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java new file mode 100644 index 00000000..87a1e5db --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java @@ -0,0 +1,11 @@ +package org.modelingvalue.dclare; + +public interface ConstantChangeHandler { + + void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue); + + T set(O object, Setable property, T post); + + State state(); + +} diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index d9440eb7..355f1cc1 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -156,12 +156,12 @@ public O object() { } @SuppressWarnings("unchecked") - public V get(LeafTransaction leafTransaction, O object, Constant constant, Function deriver) { + public V get(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { Map, Object> prev = constants; V ist = (V) prev.get(constant); if (ist == null) { - V soll = deriver == null ? constant.getDefault(object) : derive(leafTransaction, object, constant, deriver); - ist = set(leafTransaction, object, constant, prev, soll == null ? (V) NULL : soll, false); + V soll = deriver == null ? constant.getDefault(object) : derive(cch, object, constant, deriver); + ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, false); } return ist == NULL ? null : ist; } @@ -171,11 +171,11 @@ public boolean isSet(Constant constant) { } @SuppressWarnings("unchecked") - public V set(LeafTransaction leafTransaction, O object, Constant constant, V soll, boolean forced) { + public V set(ConstantChangeHandler cch, O object, Constant constant, V soll, boolean forced) { Map, Object> prev = constants; V ist = (V) prev.get(constant); if (ist == null || forced) { - ist = set(leafTransaction, object, constant, prev, soll == null ? (V) NULL : soll, forced); + ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, forced); } if (!Objects.equals(ist == NULL ? null : ist, soll)) { throw new NonDeterministicException(object, constant, "Constant is not consistent " + StringUtil.toString(object) + "." + constant + "=" + StringUtil.toString(ist) + "!=" + StringUtil.toString(soll)); @@ -184,12 +184,12 @@ public V set(LeafTransaction leafTransaction, O object, Constant const } @SuppressWarnings("unchecked") - public V set(LeafTransaction leafTransaction, O object, Constant constant, BiFunction function, E element) { + public V set(ConstantChangeHandler cch, O object, Constant constant, BiFunction function, E element) { Map, Object> prev = constants; V ist = (V) prev.get(constant); V soll = function.apply(ist, element); if (ist == null) { - ist = set(leafTransaction, object, constant, prev, soll == null ? (V) NULL : soll, false); + ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, false); } if (!Objects.equals(ist == NULL ? null : ist, soll)) { throw new NonDeterministicException(object, constant, "Constant is not consistent " + StringUtil.toString(object) + "." + constant + "=" + StringUtil.toString(ist) + "!=" + StringUtil.toString(soll)); @@ -214,7 +214,7 @@ public String toString() { } @SuppressWarnings("unchecked") - private V set(LeafTransaction tx, O object, Constant constant, Map, Object> prev, V soll, boolean forced) { + private V set(ConstantChangeHandler cch, O object, Constant constant, Map, Object> prev, V soll, boolean forced) { V ist; Map, Object> next = prev.put(constant, soll); while (!UPDATOR.compareAndSet(this, prev, next)) { @@ -227,13 +227,13 @@ private V set(LeafTransaction tx, O object, Constant constant, Map V derive(LeafTransaction leafTransaction, O object, Constant constant, Function deriver) { + private V derive(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { List> list = List.of(); while (true) { try { @@ -246,7 +246,7 @@ private V derive(LeafTransaction leafTransaction, O object, Constant c Pair me = Pair.of(object, constant); throw new NonDeterministicException(object, constant, "Circular constant definition: " + list.sublist(list.lastIndexOf(me), list.size()).add(me)); } - ConstantState.this.get(leafTransaction, lazy.a(), lazy.b()); + ConstantState.this.get(cch, lazy.a(), lazy.b()); } } finally { WEAK.setOnThread(weak); @@ -294,28 +294,28 @@ public void stop() { remover.interrupt(); } - public V get(LeafTransaction leafTransaction, O object, Constant constant) { - return getConstants(leafTransaction, object, referenceType(constant)).get(leafTransaction, object, constant, constant.deriver()); + public V get(ConstantChangeHandler cch, O object, Constant constant) { + return getConstants(cch, object, referenceType(constant)).get(cch, object, constant, constant.deriver()); } - public O object(LeafTransaction leafTransaction, O object) { - return getConstants(leafTransaction, object, ReferenceType.weak).object(); + public O object(ConstantChangeHandler cch, O object) { + return getConstants(cch, object, ReferenceType.weak).object(); } - public V get(LeafTransaction leafTransaction, O object, Constant constant, Function deriver) { - return getConstants(leafTransaction, object, referenceType(constant)).get(leafTransaction, object, constant, deriver); + public V get(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { + return getConstants(cch, object, referenceType(constant)).get(cch, object, constant, deriver); } - public boolean isSet(LeafTransaction leafTransaction, O object, Constant constant) { - return getConstants(leafTransaction, object, referenceType(constant)).isSet(constant); + public boolean isSet(ConstantChangeHandler cch, O object, Constant constant) { + return getConstants(cch, object, referenceType(constant)).isSet(constant); } - public V set(LeafTransaction leafTransaction, O object, Constant constant, V value, boolean forced) { - return getConstants(leafTransaction, object, referenceType(constant)).set(leafTransaction, object, constant, value, forced); + public V set(ConstantChangeHandler cch, O object, Constant constant, V value, boolean forced) { + return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, value, forced); } - public V set(LeafTransaction leafTransaction, O object, Constant constant, BiFunction deriver, E element) { - return getConstants(leafTransaction, object, referenceType(constant)).set(leafTransaction, object, constant, deriver, element); + public V set(ConstantChangeHandler cch, O object, Constant constant, BiFunction deriver, E element) { + return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, deriver, element); } private ReferenceType referenceType(Constant constant) { @@ -323,11 +323,11 @@ private ReferenceType referenceType(Constant constant) { } @SuppressWarnings("unchecked") - private Constants getConstants(LeafTransaction leafTransaction, O object, ReferenceType referenceType) { + private Constants getConstants(ConstantChangeHandler cch, O object, ReferenceType referenceType) { QualifiedSet prev = state.get(); Constants constants = prev.get(object); if (constants == null) { - object = leafTransaction.state().canonical(object); + object = cch.state().canonical(object); constants = new Constants<>(object, referenceType, queue); prev = pruneEqualHashes(object, prev); QualifiedSet next = prev.add(constants); diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 3c6c1710..ad707024 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -37,7 +37,7 @@ public R derive(Supplier action, State state, int depth, Mutable contextM this.contextMutable = contextMutable; this.depth = depth; try { - return derive(action, state, constantState); + return derive(action, state, constantState, this); } finally { this.depth = 0; this.contextMutable = null; @@ -45,8 +45,8 @@ public R derive(Supplier action, State state, int depth, Mutable contextM } @Override - protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { - return super.doDeriveGet(object, getable, nonDerived) && !isChanged(object, getable); + protected boolean doDerive(O object, Getable getable, T nonDerived) { + return super.doDerive(object, getable, nonDerived) && !isChanged(object, getable); } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index 430c9001..6678bbb4 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -78,8 +78,8 @@ private RecursiveAction getAction(Mutable mutable) { } @Override - protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { - return super.doDeriveSet(object, getable) && Objects.equals(nonDerived, getable.getDefault(object)) && ifReady(object, (Setable) getable, nonDerived); + protected boolean doDerive(O object, Getable getable, T nonDerived) { + return super.doDerive(object, getable, nonDerived) && Objects.equals(nonDerived, getable.getDefault(object)) && ifReady(object, (Setable) getable, nonDerived); } private boolean ifReady(O object, Setable setable, T nonDerived) { @@ -90,9 +90,9 @@ private boolean ifReady(O object, Setable setable, T nonDerived) { } @Override - protected void setInMemoization(ConstantState mem, O object, Setable setable, T result) { - super.setInMemoization(mem, object, setable, result); - if (setable.preserved() && !setable.direction().isLazy()) { + protected void setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { + super.setInMemoization(mem, object, setable, result, force); + if (!force && setable.preserved() && !setable.direction().isLazy()) { state.set(object, setable, result); } } diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index 9cb29a3a..d8238c47 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -36,7 +36,7 @@ import org.modelingvalue.collections.util.Context; @SuppressWarnings("unused") -public abstract class LeafTransaction extends Transaction { +public abstract class LeafTransaction extends Transaction implements ConstantChangeHandler { private static final Context CURRENT = Context.of(); @@ -87,8 +87,6 @@ public static Context getContext() { return CURRENT; } - public abstract State state(); - public State current() { return state(); } @@ -97,8 +95,6 @@ public State current() { public abstract T set(O object, Setable property, UnaryOperator oper); - public abstract T set(O object, Setable property, T post); - public T setDefault(O object, Setable property) { return set(object, property, property.getDefault(object)); } @@ -119,7 +115,8 @@ public T pre(O object, Getable property) { return universeTransaction().preState().get(object, property); } - protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + @Override + public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { setable.changed(this, object, rawPreValue, postValue); } diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 4bb13c5a..85b6f004 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -32,6 +32,7 @@ import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.dclare.Observer.Constructed; +import org.modelingvalue.dclare.ex.NotYetDerivableException; @SuppressWarnings("unused") public interface Mutable extends TransactionClass { @@ -263,4 +264,16 @@ private ParentContaining(Object id, SetableModifier... modifiers) { return super.get(object); } } + + @SuppressWarnings("unchecked") + public default boolean pull() { + return MutableClass.D_OBSERVEDS.get(dClass()).map(o -> { + try { + o.get(this); + } catch (NotYetDerivableException nyde) { + return true; + } + return false; + }).reduce(false, (a, b) -> a || b); + } } diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index f3e9fedd..6a07f87d 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -205,10 +205,12 @@ private State merge(State base, State[] branches) { triggeredMutables.init(Set.of()); try { State state = base.merge(this, branches, branches.length); - state = trigger(state, triggeredActions.result(), one); - for (int i = 0; i < triggeredMutables.length(); i++) { - Priority priority = triggeredMutables.priority(i); - state = triggerMutables(state, triggeredMutables.result(priority), priority); + if (push()) { + state = trigger(state, triggeredActions.result(), one); + for (int i = 0; i < triggeredMutables.length(); i++) { + Priority priority = triggeredMutables.priority(i); + state = triggerMutables(state, triggeredMutables.result(priority), priority); + } } return state; } finally { @@ -228,46 +230,47 @@ public void handleMergeConflict(Object object, Setable property, Object pre, Obj @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void handleChange(Object object, Setable setable, DefaultMap baseValues, DefaultMap[] branchesValues, DefaultMap resultValues, State base) { - if (setable instanceof Observers) { - Observers os = (Observers) setable; - DefaultMap> baseObservers = StateMap.get(baseValues, os); - DefaultMap> resultObservers = StateMap.get(resultValues, os); - os.observed().checkTooManyObservers(universeTransaction(), object, resultObservers); - DefaultMap> addedResultObservers = resultObservers.removeAll(baseObservers, Set::removeAll); - if (!addedResultObservers.isEmpty()) { - Observed observedProp = os.observed(); - Object baseValue = StateMap.get(baseValues, observedProp); - for (DefaultMap branchValues : branchesValues) { - Object branchValue = StateMap.get(branchValues, observedProp); - if (!Objects.equals(branchValue, baseValue)) { - DefaultMap> branchObservers = StateMap.get(branchValues, os); - Map> missingBranchObservers = addedResultObservers.removeAll(branchObservers, Set::removeAll).// - asMap(e -> Entry.of(e.getKey(), e.getValue().map(m -> m.dResolve((Mutable) object)).asSet())); - triggeredActions.change(ts -> ts.addAll(missingBranchObservers, Set::addAll)); + if (push()) { + if (setable instanceof Observers) { + Observers os = (Observers) setable; + DefaultMap> baseObservers = StateMap.get(baseValues, os); + DefaultMap> resultObservers = StateMap.get(resultValues, os); + os.observed().checkTooManyObservers(universeTransaction(), object, resultObservers); + DefaultMap> addedResultObservers = resultObservers.removeAll(baseObservers, Set::removeAll); + if (!addedResultObservers.isEmpty()) { + Observed observedProp = os.observed(); + Object baseValue = StateMap.get(baseValues, observedProp); + for (DefaultMap branchValues : branchesValues) { + Object branchValue = StateMap.get(branchValues, observedProp); + if (!Objects.equals(branchValue, baseValue)) { + DefaultMap> branchObservers = StateMap.get(branchValues, os); + Map> missingBranchObservers = addedResultObservers.removeAll(branchObservers, Set::removeAll).// + asMap(e -> Entry.of(e.getKey(), e.getValue().map(m -> m.dResolve((Mutable) object)).asSet())); + triggeredActions.change(ts -> ts.addAll(missingBranchObservers, Set::addAll)); + } } } - } - } else if (setable instanceof Queued) { - Queued q = (Queued) setable; - Priority prio = base.priority(q); - if (prio != zero) { - Set resultTriggered = StateMap.get(resultValues, q); - Set baseTriggered = StateMap.get(baseValues, q); - if (!resultTriggered.removeAll(baseTriggered).isEmpty()) { - Mutable resultParent = StateMap.getA(resultValues, D_PARENT_CONTAINING); - if (resultParent != null) { - for (DefaultMap branchValues : branchesValues) { - Mutable branchParent = StateMap.getA(branchValues, D_PARENT_CONTAINING); - if (!resultParent.equals(branchParent)) { - triggeredMutables.change(prio, ts -> ts.add(resultParent)); - break; + } else if (setable instanceof Queued) { + Queued q = (Queued) setable; + Priority prio = base.priority(q); + if (prio != zero) { + Set resultTriggered = StateMap.get(resultValues, q); + Set baseTriggered = StateMap.get(baseValues, q); + if (!resultTriggered.removeAll(baseTriggered).isEmpty()) { + Mutable resultParent = StateMap.getA(resultValues, D_PARENT_CONTAINING); + if (resultParent != null) { + for (DefaultMap branchValues : branchesValues) { + Mutable branchParent = StateMap.getA(branchValues, D_PARENT_CONTAINING); + if (!resultParent.equals(branchParent)) { + triggeredMutables.change(prio, ts -> ts.add(resultParent)); + break; + } } } } } } } - } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 9d43143f..f7e1a2e3 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -95,7 +95,7 @@ private void rollback(boolean atomic) { @Override protected final void run(State pre, UniverseTransaction universeTransaction) { Observer observer = observer(); - // check if the universe is still in the same transaction, if not: reset my state + // check if the universe is still in the same transaction run, if not: reset the counts of my observer observer.startTransaction(universeTransaction.stats()); // check if we should do the work... if (!observer.isStopped() && !universeTransaction.isKilled()) { @@ -345,7 +345,7 @@ public T getNonObserving(Supplier action) { @SuppressWarnings({"rawtypes", "unchecked", "RedundantSuppression"}) @Override - protected void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { if (observing(object, setable)) { changed.set(TRUE); } diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index e6fb9c44..783a3944 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -54,7 +54,8 @@ * This state will be the start state at the next invocation of this class and the method can (and will) be skipped. * This is meant for setting up a constant state in the universe that is used every time. * - * @param the Universe class for this repo + * @param + * the Universe class for this repo */ @SuppressWarnings("unused") public abstract class OneShot { @@ -65,9 +66,10 @@ public abstract class OneShot { private static final MutationWrapper, Set>> ALL_METHODS_CACHE = new MutationWrapper<>(Map.of()); private static final ContextPoolPool CONTEXT_POOL_POOL = new ContextPoolPool(); - private final Class cacheKey = getClass(); - private final U universe; - private State endState; + private final Class cacheKey = getClass(); + private final U universe; + private final boolean pull; + private State endState; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @@ -76,9 +78,9 @@ public abstract class OneShot { } @SuppressWarnings("DataFlowIssue") - public OneShot(U universe) { + public OneShot(U universe, boolean pull) { this.universe = universe; - + this.pull = pull; List cachingMethods = getAllMethodsOf(cacheKey).filter(m -> m.getAnnotation(OneShotAction.class).caching()).map(Method::getName).asList(); if (1 < cachingMethods.count()) { throw new IllegalStateException("the oneshot " + cacheKey.getSimpleName() + " has too many caching actions: " + cachingMethods.collect(Collectors.joining(", "))); @@ -140,11 +142,11 @@ public State getEndState() { if (endState == null) { ContextPool contextPool = getContextPool(); try { - StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); - boolean runningFromCache = cachedStateMap != null; - UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, getConfig(), null, cachedStateMap); - long t0 = System.nanoTime(); - List allActions = getAllActions(runningFromCache); + StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); + boolean runningFromCache = cachedStateMap != null; + UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, pull, getConfig(), null, cachedStateMap); + long t0 = System.nanoTime(); + List allActions = getAllActions(runningFromCache); trace("START", "#actions=%d", allActions.size()); allActions.forEach(a -> a.putAndWaitForIdle(universeTransaction)); universeTransaction.stop(); @@ -181,14 +183,14 @@ protected MyAction(Method method, boolean runningFromCache) { throw new Error(e); } }); - isCachingMethod = method.getAnnotation(OneShotAction.class).caching(); + isCachingMethod = method.getAnnotation(OneShotAction.class).caching(); this.runningFromCache = runningFromCache; } protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { - long t0 = System.nanoTime(); + long t0 = System.nanoTime(); boolean writeResultToCache = isCachingMethod && !runningFromCache; - boolean skip = isCachingMethod && runningFromCache; + boolean skip = isCachingMethod && runningFromCache; if (skip) { trace(" CACHE-SKIP", "%s", id()); } else { @@ -201,10 +203,10 @@ protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { STATE_MAP_CACHE.update(a -> a.computeIfAbsent(cacheKey, __ -> intermediateState.getStateMap())); } long overallNano = System.nanoTime() - t0; - long methodNano = durationNano(); - long dtOverall = nano2ms(overallNano); - long dtMethod = nano2ms(methodNano); - long dtRules = nano2ms(overallNano - methodNano); + long methodNano = durationNano(); + long dtOverall = nano2ms(overallNano); + long dtMethod = nano2ms(methodNano); + long dtRules = nano2ms(overallNano - methodNano); trace(" < computeAllMethodsOf(Class clazz) { for (Class c = clazz; c != Object.class; c = c.getSuperclass()) { for (Method m : c.getDeclaredMethods()) { if (m.isAnnotationPresent(OneShotAction.class) // - && m.getParameterCount() == 0// - && m.getReturnType().equals(void.class)// - && Modifier.isPublic(m.getModifiers())// - && !map.containsKey(m.getName())) {// + && m.getParameterCount() == 0// + && m.getReturnType().equals(void.class)// + && Modifier.isPublic(m.getModifiers())// + && !map.containsKey(m.getName())) {// map = map.put(m.getName(), m); } } @@ -251,21 +253,19 @@ private static long nano2ms(long nano) { } private static class ContextPoolPool { - private static final boolean NO_POOL_POOL_TRACE = Boolean.getBoolean("NO_POOL_POOL_TRACE"); - private static final int POOL_POOL_SIZE = Integer.getInteger("POOL_POOL_SIZE", Collection.PARALLELISM); - private static final int POOL_POOL_ALARM_THRESHOLD_SEC = Integer.getInteger("POOL_POOL_ALARM_THRESHOLD_SEC", 30); - private static final int POOL_POOL_AQUIRE_TIMEOUT_SEC = Integer.getInteger("POOL_POOL_AQUIRE_TIMEOUT_SEC", 30); - private static final int POOL_POOL_MONITOR_INTERVAL_SEC = Integer.getInteger("POOL_POOL_MONITOR_INTERVAL_SEC", 60); + private static final boolean NO_POOL_POOL_TRACE = Boolean.getBoolean("NO_POOL_POOL_TRACE"); + private static final int POOL_POOL_SIZE = Integer.getInteger("POOL_POOL_SIZE", Collection.PARALLELISM); + private static final int POOL_POOL_ALARM_THRESHOLD_SEC = Integer.getInteger("POOL_POOL_ALARM_THRESHOLD_SEC", 30); + private static final int POOL_POOL_AQUIRE_TIMEOUT_SEC = Integer.getInteger("POOL_POOL_AQUIRE_TIMEOUT_SEC", 30); + private static final int POOL_POOL_MONITOR_INTERVAL_SEC = Integer.getInteger("POOL_POOL_MONITOR_INTERVAL_SEC", 60); // - private final BlockingQueue idleQueue = new LinkedBlockingQueue<>(makePools()); - private final BlockingQueue busyQueue = new LinkedBlockingQueue<>(); - private final AtomicReference poolPoolInfo = new AtomicReference<>(new PoolPoolInfo()); - private final java.util.Map poolInfoMap; + private final BlockingQueue idleQueue = new LinkedBlockingQueue<>(makePools()); + private final BlockingQueue busyQueue = new LinkedBlockingQueue<>(); + private final AtomicReference poolPoolInfo = new AtomicReference<>(new PoolPoolInfo()); + private final java.util.Map poolInfoMap; private static java.util.Collection makePools() { - return IntStream.range(0, POOL_POOL_SIZE) - .mapToObj(i -> new PoolInfo()) - .toList(); + return IntStream.range(0, POOL_POOL_SIZE).mapToObj(i -> new PoolInfo()).toList(); } public ContextPoolPool() { @@ -282,9 +282,9 @@ public ContextPool getContextPool() { try { PoolPoolInfo.preUpdate(poolPoolInfo); trace("get"); - long t0 = System.nanoTime(); + long t0 = System.nanoTime(); PoolInfo info = idleQueue.poll(POOL_POOL_AQUIRE_TIMEOUT_SEC, TimeUnit.SECONDS); - long dt = (System.nanoTime() - t0) / 1_000_000; + long dt = (System.nanoTime() - t0) / 1_000_000; if (info == null) { trace("timeout"); throw new RuntimeException("timeout after " + dt + " ms while waiting for ContextPool"); @@ -316,12 +316,7 @@ public boolean doneWithContextPool(ContextPool pool) { private void trace(String msg) { if (!NO_POOL_POOL_TRACE) { - System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", - Thread.currentThread().getName(), - msg, - idleQueue.size(), - busyQueue.size(), - poolPoolInfo.get()); + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", Thread.currentThread().getName(), msg, idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); } } @@ -348,7 +343,7 @@ private PoolPoolMonitor(ContextPoolPool contextPoolPool) { @SuppressWarnings("BusyWait") @Override public void run() { - for (; ; ) { + for (;;) { try { Thread.sleep(POOL_POOL_MONITOR_INTERVAL_SEC * 1000L); contextPoolPool.check(); @@ -362,9 +357,9 @@ public void run() { private static class PoolInfo { private final ContextPool pool; - private boolean busy; - private long startTick; - private long lastDuration; + private boolean busy; + private long startTick; + private long lastDuration; public PoolInfo() { pool = ContextThread.createPool(); @@ -376,15 +371,15 @@ public PoolInfo() { } public void start() { - busy = true; + busy = true; lastDuration = 0; - startTick = System.currentTimeMillis(); + startTick = System.currentTimeMillis(); } public void stop() { - busy = false; + busy = false; lastDuration = duration(); - startTick = 0; + startTick = 0; } public long duration() { @@ -401,11 +396,11 @@ private static class PoolPoolInfo { private final long maxWaitTime; public PoolPoolInfo() { - this.gets = 0; - this.immediates = 0; - this.waits = 0; + this.gets = 0; + this.immediates = 0; + this.waits = 0; this.totalWaitTime = 0; - this.maxWaitTime = 0; + this.maxWaitTime = 0; } public static void preUpdate(AtomicReference poolPoolInfo) { @@ -417,7 +412,7 @@ public static void postUpdate(AtomicReference poolPoolInfo, long d } private static void update(AtomicReference poolPoolInfo, Function f) { - for (; ; ) { + for (;;) { PoolPoolInfo oldInfo = poolPoolInfo.get(); PoolPoolInfo newInfo = f.apply(oldInfo); if (poolPoolInfo.compareAndSet(oldInfo, newInfo)) { @@ -427,21 +422,16 @@ private static void update(AtomicReference poolPoolInfo, Function< } private PoolPoolInfo(long gets, long immediates, long waits, long totalWaitTime, long maxWaitTime) { - this.gets = gets; - this.immediates = immediates; - this.waits = waits; + this.gets = gets; + this.immediates = immediates; + this.waits = waits; this.totalWaitTime = totalWaitTime; - this.maxWaitTime = maxWaitTime; + this.maxWaitTime = maxWaitTime; } @Override public String toString() { - return String.format("%4d gets (%4d immediates %4d waits %8d ms totalWait, %8d ms max-wait)", - gets, - immediates, - waits, - totalWaitTime, - maxWaitTime); + return String.format("%4d gets (%4d immediates %4d waits %8d ms totalWait, %8d ms max-wait)", gets, immediates, waits, totalWaitTime, maxWaitTime); } } } diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index d3edbd47..31f3b4ec 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -66,7 +66,7 @@ public State state() { } @Override - protected void changed(O object, Setable property, T preValue, T rawPreValue, T postValue) { + public void changed(O object, Setable property, T preValue, T rawPreValue, T postValue) { if (property instanceof Constant) { if (property.isHandlingChange()) { universeTransaction().put(new Object(), () -> super.changed(object, property, preValue, rawPreValue, postValue)); diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index 9b947f95..fb50a27b 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -220,24 +220,31 @@ protected final void changed(LeafTransaction tx, O object, T preValue, T postVal changed.accept(tx, object, preValue, postValue); } if (containment) { + boolean push = tx.push(); Setable. diff(preValue, postValue, added -> { Pair> prePair = tx.getRaw(added, Mutable.D_PARENT_CONTAINING); if (prePair != null) { MOVING.run(true, () -> prePair.b().remove(prePair.a(), added)); } Mutable.D_PARENT_CONTAINING.set(added, Pair.of((Mutable) object, (Setable) this)); - if (prePair == null) { - added.dActivate(); - } else { - tx.set((Mutable) object, tx.state().children(one), Set::add, added); + if (push) { + if (prePair == null) { + added.dActivate(); + } else { + tx.set((Mutable) object, tx.state().children(one), Set::add, added); + } } }, removed -> { - for (Priority prio : Priority.ALL) { - tx.set((Mutable) object, tx.state().children(prio), Set::remove, removed); + if (push) { + for (Priority prio : Priority.ALL) { + tx.set((Mutable) object, tx.state().children(prio), Set::remove, removed); + } } if (!MOVING.get()) { Mutable.D_PARENT_CONTAINING.setDefault(removed); - removed.dHandleRemoved((Mutable) object); + if (push) { + removed.dHandleRemoved((Mutable) object); + } } }); } diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 0d0ca072..b3342492 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -266,7 +266,16 @@ public void run(Runnable action) { public R derive(Supplier supplier, ConstantState constantState) { DerivationTransaction tx = universeTransaction.derivation.openTransaction(universeTransaction); try { - return tx.derive(supplier, this, constantState); + return tx.derive(supplier, this, constantState, tx); + } finally { + universeTransaction.derivation.closeTransaction(tx); + } + } + + public R derive(Supplier supplier, ConstantState constantState, ConstantChangeHandler changeHandler) { + DerivationTransaction tx = universeTransaction.derivation.openTransaction(universeTransaction); + try { + return tx.derive(supplier, this, constantState, changeHandler); } finally { universeTransaction.derivation.closeTransaction(tx); } @@ -285,7 +294,7 @@ public State deriveLazy() { ConstantState derivationState = new ConstantState("LAZY", universeTransaction::handleException); LazyDerivationTransaction tx = universeTransaction.lazyDerivation.openTransaction(universeTransaction); try { - return tx.derive(() -> tx.derive(), this, derivationState); + return tx.derive(() -> tx.derive(), this, derivationState, tx); } finally { derivationState.stop(); universeTransaction.lazyDerivation.closeTransaction(tx); diff --git a/src/main/java/org/modelingvalue/dclare/Transaction.java b/src/main/java/org/modelingvalue/dclare/Transaction.java index c6fad5dc..68bb2525 100644 --- a/src/main/java/org/modelingvalue/dclare/Transaction.java +++ b/src/main/java/org/modelingvalue/dclare/Transaction.java @@ -60,6 +60,14 @@ public UniverseTransaction universeTransaction() { return universeTransaction; } + public boolean pull() { + return universeTransaction.pull(); + } + + public boolean push() { + return universeTransaction.push(); + } + public void start(TransactionClass cls, MutableTransaction parent) { if (this.cls != null) { throw new ConcurrentModificationException(); diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index 01b89e30..06bb3399 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -24,8 +24,11 @@ public interface Universe extends Mutable, Internable { default void init() { - LeafTransaction.getCurrent().universeTransaction().setInitialized(); - dActivate(); + UniverseTransaction universeTransaction = LeafTransaction.getCurrent().universeTransaction(); + universeTransaction.setInitialized(); + if (universeTransaction.push()) { + dActivate(); + } } default void exit() { @@ -36,4 +39,11 @@ default void exit() { default boolean dIsOrphan(State state) { return false; } + + @Override + public default boolean pull() { + for (boolean incomplete = Mutable.super.pull(); incomplete; incomplete = Mutable.super.pull()) { + } + return false; + } } diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index fcc76998..2b2beded 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -20,6 +20,16 @@ package org.modelingvalue.dclare; +import java.util.Iterator; +import java.util.Objects; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; +import java.util.function.Predicate; + import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.DefaultMap; import org.modelingvalue.collections.Entry; @@ -36,16 +46,6 @@ import org.modelingvalue.dclare.ex.ConsistencyError; import org.modelingvalue.dclare.ex.TooManyChangesException; -import java.util.Iterator; -import java.util.Objects; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import java.util.function.Predicate; - @SuppressWarnings("unused") public class UniverseTransaction extends MutableTransaction { @@ -70,6 +70,7 @@ public class UniverseTransaction extends MutableTransaction { private final Action checkConsistency = Action.of("$checkConsistency", this::checkConsistency); private final Action deriveLazy = Action.of("$deriveLazy", this::deriveLazy); // + private final boolean pull; protected final BlockingQueue> inQueue; private final BlockingQueue resultQueue = new LinkedBlockingQueue<>(1); //TODO wire onto MoodManager private final State emptyState = createState(StateMap.EMPTY_STATE_MAP); @@ -163,11 +164,12 @@ public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig con } public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig config, Consumer startStatusConsumer) { - this(universe, pool, config, startStatusConsumer, null); + this(universe, pool, false, config, startStatusConsumer, null); } - public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig config, Consumer startStatusConsumer, StateMap startStateMap) { + public UniverseTransaction(Universe universe, ContextPool pool, boolean pull, DclareConfig config, Consumer startStatusConsumer, StateMap startStateMap) { super(null); + this.pull = pull; if (universe == null) { throw new IllegalArgumentException("UniverseTransaction can not start without a Universe (universe argument is null)"); } @@ -196,6 +198,16 @@ public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig con } } + @Override + public final boolean pull() { + return pull; + } + + @Override + public final boolean push() { + return !pull; + } + private State createStartState(Universe universe, StateMap stateMap) { if (stateMap != null) { // take care that the startStateMap does not contain the STOPPED state diff --git a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java new file mode 100644 index 00000000..c8af418a --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java @@ -0,0 +1,5 @@ +package org.modelingvalue.dclare.ex; + +public class NotYetDerivableException extends RuntimeException { + private static final long serialVersionUID = -9138263608521723722L; +} diff --git a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java index 200cc17a..d1f801c9 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java @@ -20,24 +20,15 @@ package org.modelingvalue.dclare.test.support; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.modelingvalue.collections.Collection; -import org.modelingvalue.dclare.Mutable; -import org.modelingvalue.dclare.MutableClass; -import org.modelingvalue.dclare.Observed; -import org.modelingvalue.dclare.Observer; -import org.modelingvalue.dclare.OneShot; -import org.modelingvalue.dclare.Setable; -import org.modelingvalue.dclare.StateMap; -import org.modelingvalue.dclare.Universe; +import static org.modelingvalue.dclare.test.support.OneShotTests.TestUniverse.*; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import static org.modelingvalue.dclare.test.support.OneShotTests.TestUniverse.BASE; -import static org.modelingvalue.dclare.test.support.OneShotTests.TestUniverse.ELSE; -import static org.modelingvalue.dclare.test.support.OneShotTests.TestUniverse.STAR; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.modelingvalue.collections.Collection; +import org.modelingvalue.dclare.*; public class OneShotTests { static { @@ -47,17 +38,20 @@ public class OneShotTests { private static final String MARKER = "xyzzy"; private static final String SEP = "-"; + private Random random = new Random(); + @Test public void reuseInOneTest() { AtomicInteger invokes1 = new AtomicInteger(); AtomicInteger invokes2 = new AtomicInteger(); for (int i = 0; i < 100; i++) { - boolean starred = new Random().nextBoolean(); - TestOneShotInOne oneShot2 = new TestOneShotInOne(starred, i, invokes1, invokes2); - StateMap map2 = oneShot2.getEndStateMap(); + boolean starred = random.nextBoolean(); + boolean pull = random.nextBoolean(); + TestOneShotInOne oneShot2 = new TestOneShotInOne(pull, starred, i, invokes1, invokes2); + StateMap map2 = oneShot2.getEndStateMap(); - Observed updated = starred ? STAR : ELSE; + Observed updated = starred ? STAR : ELSE; Observed notUpdated = starred ? ELSE : STAR; Assertions.assertEquals(MARKER, map2.get(TEST_UNIVERSE, BASE), "at " + i); @@ -76,10 +70,10 @@ public static class TestOneShotInOne extends OneShot { private final AtomicInteger invokes1; private final AtomicInteger invokes2; - public TestOneShotInOne(boolean starred, int end, AtomicInteger invokes1, AtomicInteger invokes2) { - super(TEST_UNIVERSE); - this.starred = starred; - this.end = end; + public TestOneShotInOne(boolean pull, boolean starred, int end, AtomicInteger invokes1, AtomicInteger invokes2) { + super(TEST_UNIVERSE, pull); + this.starred = starred; + this.end = end; this.invokes1 = invokes1; this.invokes2 = invokes2; } @@ -105,16 +99,16 @@ public static class TestUniverse implements Universe { public static final Observed STAR = Observed.of("STAR", null); public static final Observed ELSE = Observed.of("ELSE", null); public static final MutableClass D_CLASS = new MutableClass() { - @Override - public Collection> dObservers() { - return Collection.of(); - } - - @Override - public Collection> dSetables() { - return Collection.of(); - } - }; + @Override + public Collection> dObservers() { + return Collection.of(); + } + + @Override + public Collection> dSetables() { + return Collection.of(BASE, STAR, ELSE); + } + }; @Override public MutableClass dClass() { From fef31dd1f48b4100d4b8ba997d88a16d1dfc6641 Mon Sep 17 00:00:00 2001 From: automation Date: Mon, 4 Mar 2024 13:13:47 +0000 Subject: [PATCH 032/179] [no-ci] updated by mvgplugin --- .../dclare/ConstantChangeHandler.java | 20 +++++++++++++++++++ .../dclare/ex/NotYetDerivableException.java | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java index 87a1e5db..f1aa5673 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; public interface ConstantChangeHandler { diff --git a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java index c8af418a..c77f1097 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare.ex; public class NotYetDerivableException extends RuntimeException { From 70aaf8620db7a7b2e7dffb64efa944549d257ee7 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Sun, 10 Mar 2024 09:48:37 +0100 Subject: [PATCH 033/179] copilot ignore --- .idea/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.idea/.gitignore b/.idea/.gitignore index b58b603f..7abb13d0 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -3,3 +3,5 @@ /workspace.xml # Editor-based HTTP Client requests /httpRequests/ +# GitHub Copilot persisted chat sessions +/copilot/chatSessions From 916b8dea7cd4e5c9594efec6d42f5df5ab28692e Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 11 Mar 2024 16:55:13 +0100 Subject: [PATCH 034/179] push pull --- .../dclare/AbstractDerivationTransaction.java | 33 +++++++---- .../dclare/ActionTransaction.java | 7 ++- .../dclare/ConstantChangeHandler.java | 2 + .../modelingvalue/dclare/ConstantState.java | 14 +++++ .../dclare/IdentityDerivationTransaction.java | 4 +- .../dclare/ImperativeTransaction.java | 2 +- .../dclare/LazyDerivationTransaction.java | 9 +-- .../modelingvalue/dclare/LeafTransaction.java | 24 +++++--- .../org/modelingvalue/dclare/Mutable.java | 36 +++++------ .../modelingvalue/dclare/MutableClass.java | 4 ++ .../org/modelingvalue/dclare/Newable.java | 4 +- .../org/modelingvalue/dclare/OneShot.java | 59 +++++++++++-------- .../dclare/ReadOnlyTransaction.java | 2 +- .../org/modelingvalue/dclare/Setable.java | 22 +++---- .../org/modelingvalue/dclare/Universe.java | 15 +---- .../dclare/UniverseTransaction.java | 19 ++++-- 16 files changed, 152 insertions(+), 104 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 7617bb10..6057ea1e 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -41,6 +41,7 @@ public abstract class AbstractDerivationTransaction extends ReadOnlyTransaction @SuppressWarnings("rawtypes") private static final Context DERIVED_VALUE = Context.of(null); private static final Context INDENT = Context.of(0); + private static final Context DERIVE = Context.of(true); public static boolean isDeriving() { return !DERIVED.get().isEmpty(); @@ -68,8 +69,13 @@ public R derive(Supplier action, State state, ConstantState memoization, } @SuppressWarnings("rawtypes") - protected boolean doDerive(O object, Getable getable, T nonDerived) { - return object instanceof Mutable && getable instanceof Observed; + protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { + return object instanceof Mutable && getable instanceof Observed && DERIVE.get(); + } + + @SuppressWarnings("rawtypes") + protected boolean doDeriveSet(O object, Getable getable, T nonDerived) { + return object instanceof Mutable && getable instanceof Observed && isDeriving(); } protected T getNonDerived(O object, Getable getable) { @@ -90,7 +96,7 @@ protected T current(O object, Getable getable) { @SuppressWarnings({"rawtypes", "unchecked"}) private T derive(O object, Getable getable, T nonDerived) { - if (doDerive(object, getable, nonDerived)) { + if (doDeriveGet(object, getable, nonDerived)) { Observed observed = (Observed) getable; DerivedValue outerDerivedValue = DERIVED_VALUE.get(); boolean isDerived = outerDerivedValue != null && outerDerivedValue.isDerived(object, observed); @@ -117,11 +123,7 @@ private T derive(O object, Getable getable, T nonDerived) { DerivedValue innerDerivedValue = new DerivedValue(object, observed); INDENT.run(INDENT.get() + 1, () -> DERIVED.run(newDerived, () -> DERIVED_VALUE.run(innerDerivedValue, () -> { int i = 0; - Set observers = ((Mutable) object).dAllDerivers(observed).asSet(); - for (Observer observer : observers.filter(Observer::anonymous)) { - runDeriver((Mutable) object, observed, observer, ++i); - } - for (Observer observer : observers.exclude(Observer::anonymous)) { + for (Observer observer : ((Mutable) object).dAllDerivers(observed)) { runDeriver((Mutable) object, observed, observer, ++i); } if (innerDerivedValue.isSet()) { @@ -180,12 +182,12 @@ public T set(O object, Setable setable, T post) { } public void runNonDeriving(Runnable action) { - DERIVED.run(Set.of(), action); + DERIVE.run(false, action); } @SuppressWarnings({"unchecked", "rawtypes"}) private T set(O object, Setable setable, T post, T nonDerived) { - if (doDerive(object, setable, nonDerived) && isDeriving()) { + if (doDeriveSet(object, setable, nonDerived)) { Observed observed = (Observed) setable; DerivedValue derivedValue = DERIVED_VALUE.get(); boolean isDerived = derivedValue != null && derivedValue.isDerived(object, observed); @@ -212,7 +214,7 @@ Setable. diff(pre, result, added -> { } return pre; } else if (!Objects.equals(nonDerived, post)) { - return changeHandler.set(object, setable, post); + return changeHandler == this ? super.set(object, setable, post) : changeHandler.set(object, setable, post); } else { return post; } @@ -259,6 +261,11 @@ private T replace(T post, Newable po, Newable pr) { return post; } + @Override + public void trigger(O mutable, Action action, Priority priority) { + changeHandler.trigger(mutable, action, priority); + } + @Override public O directConstruct(Construction.Reason reason, Supplier supplier) { return super.construct(reason, supplier); @@ -275,8 +282,8 @@ public O construct(Reason reason, Supplier supplier) { return result; } - protected void setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { - mem.set(changeHandler, object, setable.constant(), result, force); + protected T setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { + return force ? mem.set(changeHandler, object, setable.constant(), result, force) : mem.getOrSet(changeHandler, object, setable.constant(), result); } protected ConstantState memoization(O object) { diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 4ccf5ac5..d9621a65 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -55,6 +55,11 @@ public State state() { public T set(O object, Setable property, T post) { return ActionTransaction.this.set(object, property, post); } + + @Override + public void trigger(O mutable, Action action, Priority priority) { + ActionTransaction.this.trigger(mutable, action, priority); + } }; @SuppressWarnings("unchecked") private final Supplier supplier = () -> { @@ -78,7 +83,7 @@ protected void run(State pre, UniverseTransaction universeTransaction) { if (push()) { ((Action) action()).run(mutable()); } else { - state().derive(supplier, constantState(), changeHandler); + state().derive(supplier, pullConstantState(), changeHandler); } } diff --git a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java index f1aa5673..9ce888dc 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java @@ -28,4 +28,6 @@ public interface ConstantChangeHandler { State state(); + void trigger(O mutable, Action action, Priority priority); + } diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 355f1cc1..c40432f6 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -170,6 +170,16 @@ public boolean isSet(Constant constant) { return constants.get(constant) != null; } + @SuppressWarnings("unchecked") + public V getOrSet(ConstantChangeHandler cch, O object, Constant constant, V soll) { + Map, Object> prev = constants; + V ist = (V) prev.get(constant); + if (ist == null) { + ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, false); + } + return ist; + } + @SuppressWarnings("unchecked") public V set(ConstantChangeHandler cch, O object, Constant constant, V soll, boolean forced) { Map, Object> prev = constants; @@ -310,6 +320,10 @@ public boolean isSet(ConstantChangeHandler cch, O object, Constant return getConstants(cch, object, referenceType(constant)).isSet(constant); } + public V getOrSet(ConstantChangeHandler cch, O object, Constant constant, V value) { + return getConstants(cch, object, referenceType(constant)).getOrSet(cch, object, constant, value); + } + public V set(ConstantChangeHandler cch, O object, Constant constant, V value, boolean forced) { return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, value, forced); } diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index ad707024..3e94e2a7 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -45,8 +45,8 @@ public R derive(Supplier action, State state, int depth, Mutable contextM } @Override - protected boolean doDerive(O object, Getable getable, T nonDerived) { - return super.doDerive(object, getable, nonDerived) && !isChanged(object, getable); + protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { + return super.doDeriveGet(object, getable, nonDerived) && !isChanged(object, getable); } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 49528869..4e0f8fe8 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -181,7 +181,7 @@ private void imper2dclare() { } @Override - protected void trigger(O target, Action action, Priority priority) { + public void trigger(O target, Action action, Priority priority) { set(target, state.actions(priority), Set::add, action); } diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index 6678bbb4..c7998163 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -78,8 +78,8 @@ private RecursiveAction getAction(Mutable mutable) { } @Override - protected boolean doDerive(O object, Getable getable, T nonDerived) { - return super.doDerive(object, getable, nonDerived) && Objects.equals(nonDerived, getable.getDefault(object)) && ifReady(object, (Setable) getable, nonDerived); + protected boolean doDeriveGet(O object, Getable getable, T nonDerived) { + return super.doDeriveGet(object, getable, nonDerived) && Objects.equals(nonDerived, getable.getDefault(object)) && ifReady(object, (Setable) getable, nonDerived); } private boolean ifReady(O object, Setable setable, T nonDerived) { @@ -90,11 +90,12 @@ private boolean ifReady(O object, Setable setable, T nonDerived) { } @Override - protected void setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { - super.setInMemoization(mem, object, setable, result, force); + protected T setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { + result = super.setInMemoization(mem, object, setable, result, force); if (!force && setable.preserved() && !setable.direction().isLazy()) { state.set(object, setable, result); } + return result; } private static final class DeriveAction extends RecursiveAction { diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index d8238c47..90ffd42c 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -120,6 +120,17 @@ public void changed(O object, Setable setable, T preValue, T rawPre setable.changed(this, object, rawPreValue, postValue); } + protected final void dActivate(Mutable added) { + added.dActivate(this); + added.dChildren().forEach(this::dActivate); + } + + protected final void dDeactivate(Mutable orphan) { + orphan.dDeactivate(this); + clear(orphan); + orphan.dChildren().forEach(this::dDeactivate); + } + @SuppressWarnings({"rawtypes", "unchecked"}) public void clear(Mutable object) { for (Setable setable : toBeCleared(object)) { @@ -127,18 +138,13 @@ public void clear(Mutable object) { } } - protected final void clearOrphan(Mutable orphan) { - orphan.dDeactivate(this); - clear(orphan); - orphan.dChildren().forEach(this::clearOrphan); - } - @SuppressWarnings("rawtypes") protected Collection toBeCleared(Mutable object) { return state().getProperties(object).map(Entry::getKey).exclude(Setable::doNotClear); } - protected void trigger(O target, Action action, Priority priority) { + @Override + public void trigger(O target, Action action, Priority priority) { Mutable object = target; set(object, state().actions(priority), Set::add, action); for (int i = priority.ordinal() + 1; i < ALL.length; i++) { @@ -202,6 +208,10 @@ protected ConstantState constantState() { return universeTransaction().constantState(); } + protected ConstantState pullConstantState() { + return universeTransaction().pullConstantState(); + } + public O directConstruct(Construction.Reason reason, Supplier supplier) { return construct(reason, supplier); } diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 85b6f004..f7d579af 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -32,7 +32,6 @@ import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.dclare.Observer.Constructed; -import org.modelingvalue.dclare.ex.NotYetDerivableException; @SuppressWarnings("unused") public interface Mutable extends TransactionClass { @@ -75,6 +74,11 @@ Setable., Construction> diff(b, a, }); }, plumbing, doNotMerge); + @SuppressWarnings("unchecked") + Action D_PUSH_IF_PULL_ACTION = Action.of("D_PUSH_IF_PULL_ACTION", m -> { + MutableClass.D_PUSH_IF_PULL.get(m.dClass()).forEach(o -> o.get(m)); + }); + default Construction dInitialConstruction() { return D_INITIAL_CONSTRUCTION.get(this); } @@ -167,18 +171,21 @@ default T dParent(Class cls) { return cls.isInstance(p) ? (T) p : null; } - default void dActivate() { - D_OBSERVERS_RULE.trigger(this); - D_PUSHING_CONSTANTS_RULE.trigger(this); - for (Mutable child : dChildren()) { - child.dActivate(); + default void dActivate(LeafTransaction tx) { + if (tx.push()) { + D_OBSERVERS_RULE.trigger(this); + D_PUSHING_CONSTANTS_RULE.trigger(this); + } else if (!MutableClass.D_PUSH_IF_PULL.get(dClass()).isEmpty()) { + D_PUSH_IF_PULL_ACTION.trigger(this); } } default void dDeactivate(LeafTransaction tx) { - D_OBSERVERS_RULE.deObserve(tx, this); - D_PUSHING_CONSTANTS_RULE.deObserve(tx, this); - D_OBSERVERS.setDefault(this); + if (tx.push()) { + D_OBSERVERS_RULE.deObserve(tx, this); + D_PUSHING_CONSTANTS_RULE.deObserve(tx, this); + D_OBSERVERS.setDefault(this); + } } MutableClass dClass(); @@ -265,15 +272,4 @@ private ParentContaining(Object id, SetableModifier... modifiers) { } } - @SuppressWarnings("unchecked") - public default boolean pull() { - return MutableClass.D_OBSERVEDS.get(dClass()).map(o -> { - try { - o.get(this); - } catch (NotYetDerivableException nyde) { - return true; - } - return false; - }).reduce(false, (a, b) -> a || b); - } } diff --git a/src/main/java/org/modelingvalue/dclare/MutableClass.java b/src/main/java/org/modelingvalue/dclare/MutableClass.java index 5ab550e0..79419600 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableClass.java +++ b/src/main/java/org/modelingvalue/dclare/MutableClass.java @@ -51,6 +51,10 @@ public interface MutableClass extends Internable { Constant> D_NON_DERIVERS = Constant.of("D_NON_DERIVERS", // c -> c.dObservers().filter(o -> o.targets().isEmpty()).map(s -> (Observer) s).asSet()); + @SuppressWarnings({"rawtypes"}) + Constant> D_PUSH_IF_PULL = Constant.of("D_PUSH_IF_PULL", // + c -> D_OBSERVEDS.get(c).filter(o -> o.containment() || o.hasOpposite()).filter(o -> !D_DERIVERS.get(c).get(o).isEmpty()).asSet()); + Collection> dObservers(); Collection> dSetables(); diff --git a/src/main/java/org/modelingvalue/dclare/Newable.java b/src/main/java/org/modelingvalue/dclare/Newable.java index 03efced2..c1a2ad08 100644 --- a/src/main/java/org/modelingvalue/dclare/Newable.java +++ b/src/main/java/org/modelingvalue/dclare/Newable.java @@ -33,8 +33,8 @@ public interface Newable extends Mutable { Object dNewableType(); @Override - default void dActivate() { - Mutable.super.dActivate(); + default void dActivate(LeafTransaction tx) { + Mutable.super.dActivate(tx); } @Override diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 783a3944..38a220fb 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -28,8 +28,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Comparator; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; @@ -59,17 +59,18 @@ */ @SuppressWarnings("unused") public abstract class OneShot { - private static final boolean TRACE_ONE_SHOT = Boolean.getBoolean("TRACE_ONE_SHOT"); - private static final String TRACE_ONE_SHOT_OBJECT = System.getProperty("TRACE_ONE_SHOT_OBJECT"); - private static final String TRACE_ONE_SHOT_SETABLE = System.getProperty("TRACE_ONE_SHOT_SETABLE"); - private static final MutationWrapper, StateMap>> STATE_MAP_CACHE = new MutationWrapper<>(Map.of()); - private static final MutationWrapper, Set>> ALL_METHODS_CACHE = new MutationWrapper<>(Map.of()); - private static final ContextPoolPool CONTEXT_POOL_POOL = new ContextPoolPool(); - - private final Class cacheKey = getClass(); - private final U universe; - private final boolean pull; - private State endState; + private static final boolean TRACE_ONE_SHOT = Boolean.getBoolean("TRACE_ONE_SHOT"); + private static final String TRACE_ONE_SHOT_OBJECT = System.getProperty("TRACE_ONE_SHOT_OBJECT"); + private static final String TRACE_ONE_SHOT_SETABLE = System.getProperty("TRACE_ONE_SHOT_SETABLE"); + private static final MutationWrapper, StateMap>> STATE_MAP_CACHE = new MutationWrapper<>(Map.of()); + private static final MutationWrapper, Set>> ALL_METHODS_CACHE = new MutationWrapper<>(Map.of()); + private static final MutationWrapper, ConstantState>> CONSTANT_STATE_CACHE = new MutationWrapper<>(Map.of()); + private static final ContextPoolPool CONTEXT_POOL_POOL = new ContextPoolPool(); + + private final Class cacheKey = getClass(); + private final U universe; + private final boolean pull; + private State endState; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @@ -81,10 +82,6 @@ public abstract class OneShot { public OneShot(U universe, boolean pull) { this.universe = universe; this.pull = pull; - List cachingMethods = getAllMethodsOf(cacheKey).filter(m -> m.getAnnotation(OneShotAction.class).caching()).map(Method::getName).asList(); - if (1 < cachingMethods.count()) { - throw new IllegalStateException("the oneshot " + cacheKey.getSimpleName() + " has too many caching actions: " + cachingMethods.collect(Collectors.joining(", "))); - } } /** @@ -126,6 +123,7 @@ public StateMap getEndStateMap() { public void clearCache() { STATE_MAP_CACHE.update(m -> m.remove(cacheKey)); + CONSTANT_STATE_CACHE.update(m -> m.remove(cacheKey)); } /** @@ -142,15 +140,19 @@ public State getEndState() { if (endState == null) { ContextPool contextPool = getContextPool(); try { + long t0 = System.nanoTime(); StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); + ConstantState cachedConstantState = CONSTANT_STATE_CACHE.get().get(cacheKey); boolean runningFromCache = cachedStateMap != null; - UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, pull, getConfig(), null, cachedStateMap); - long t0 = System.nanoTime(); + UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, pull, getConfig(), null, cachedStateMap, cachedConstantState); List allActions = getAllActions(runningFromCache); trace("START", "#actions=%d", allActions.size()); allActions.forEach(a -> a.putAndWaitForIdle(universeTransaction)); universeTransaction.stop(); endState = universeTransaction.waitForEnd(); + if (cachedConstantState == null) { + CONSTANT_STATE_CACHE.update(a -> a.computeIfAbsent(cacheKey, __ -> universeTransaction.constantState())); + } trace("DONE", "duration=%5d ms", nano2ms(System.nanoTime() - t0)); } finally { doneWithContextPool(contextPool); @@ -223,7 +225,14 @@ private static void traceDiff(State intermediateState) { } private static Set getAllMethodsOf(Class clazz) { - return ALL_METHODS_CACHE.updateAndGet(a -> a.computeIfAbsent(clazz, __ -> computeAllMethodsOf(clazz))).get(clazz); + return ALL_METHODS_CACHE.updateAndGet(a -> a.computeIfAbsent(clazz, __ -> { + Set methods = computeAllMethodsOf(clazz); + List cachingMethods = methods.filter(m -> m.getAnnotation(OneShotAction.class).caching()).map(Method::getName).asList(); + if (1 < cachingMethods.count()) { + throw new IllegalStateException("the oneshot " + clazz.getSimpleName() + " has too many caching actions: " + cachingMethods.collect(Collectors.joining(", "))); + } + return methods; + })).get(clazz); } private static Set computeAllMethodsOf(Class clazz) { @@ -259,8 +268,8 @@ private static class ContextPoolPool { private static final int POOL_POOL_AQUIRE_TIMEOUT_SEC = Integer.getInteger("POOL_POOL_AQUIRE_TIMEOUT_SEC", 30); private static final int POOL_POOL_MONITOR_INTERVAL_SEC = Integer.getInteger("POOL_POOL_MONITOR_INTERVAL_SEC", 60); // - private final BlockingQueue idleQueue = new LinkedBlockingQueue<>(makePools()); - private final BlockingQueue busyQueue = new LinkedBlockingQueue<>(); + private final BlockingDeque idleQueue = new LinkedBlockingDeque<>(makePools()); + private final BlockingDeque busyQueue = new LinkedBlockingDeque<>(); private final AtomicReference poolPoolInfo = new AtomicReference<>(new PoolPoolInfo()); private final java.util.Map poolInfoMap; @@ -283,7 +292,7 @@ public ContextPool getContextPool() { PoolPoolInfo.preUpdate(poolPoolInfo); trace("get"); long t0 = System.nanoTime(); - PoolInfo info = idleQueue.poll(POOL_POOL_AQUIRE_TIMEOUT_SEC, TimeUnit.SECONDS); + PoolInfo info = idleQueue.pollFirst(POOL_POOL_AQUIRE_TIMEOUT_SEC, TimeUnit.SECONDS); long dt = (System.nanoTime() - t0) / 1_000_000; if (info == null) { trace("timeout"); @@ -291,7 +300,7 @@ public ContextPool getContextPool() { } PoolPoolInfo.postUpdate(poolPoolInfo, dt); info.start(); - busyQueue.add(info); + busyQueue.addFirst(info); trace(String.format("waited %6d ms", dt)); return info.pool; } catch (InterruptedException e) { @@ -309,7 +318,7 @@ public boolean doneWithContextPool(ContextPool pool) { throw new IllegalStateException("pool not busy"); } info.stop(); - idleQueue.add(info); + idleQueue.addFirst(info); trace("done"); return true; } diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 31f3b4ec..65d6c802 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -97,7 +97,7 @@ public ActionInstance actionInstance() { } @Override - protected void trigger(O mutable, Action action, Priority priority) { + public void trigger(O mutable, Action action, Priority priority) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index fb50a27b..20a1d6e3 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -21,7 +21,6 @@ package org.modelingvalue.dclare; import static org.modelingvalue.dclare.CoreSetableModifier.symmetricOpposite; -import static org.modelingvalue.dclare.Priority.one; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -204,6 +203,10 @@ public boolean containment() { return opposite != null ? opposite.get() : null; } + public boolean hasOpposite() { + return opposite != null; + } + @Override public Setable> scope() { return scope != null ? scope.get() : null; @@ -227,18 +230,17 @@ Setable. diff(preValue, postValue, added -> { MOVING.run(true, () -> prePair.b().remove(prePair.a(), added)); } Mutable.D_PARENT_CONTAINING.set(added, Pair.of((Mutable) object, (Setable) this)); - if (push) { - if (prePair == null) { - added.dActivate(); - } else { - tx.set((Mutable) object, tx.state().children(one), Set::add, added); + if (prePair == null) { + tx.dActivate(added); + } + for (Priority prio : Priority.ALL) { + if ((prePair != null && prio == Priority.one) || !tx.current(added, tx.state().children(prio)).isEmpty() || !tx.current(added, tx.state().actions(prio)).isEmpty()) { + tx.set((Mutable) object, tx.state().children(prio), Set::add, added); } } }, removed -> { - if (push) { - for (Priority prio : Priority.ALL) { - tx.set((Mutable) object, tx.state().children(prio), Set::remove, removed); - } + for (Priority prio : Priority.ALL) { + tx.set((Mutable) object, tx.state().children(prio), Set::remove, removed); } if (!MOVING.get()) { Mutable.D_PARENT_CONTAINING.setDefault(removed); diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index 06bb3399..c6571be4 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -24,11 +24,9 @@ public interface Universe extends Mutable, Internable { default void init() { - UniverseTransaction universeTransaction = LeafTransaction.getCurrent().universeTransaction(); - universeTransaction.setInitialized(); - if (universeTransaction.push()) { - dActivate(); - } + LeafTransaction tx = LeafTransaction.getCurrent(); + tx.universeTransaction().setInitialized(); + tx.dActivate(this); } default void exit() { @@ -39,11 +37,4 @@ default void exit() { default boolean dIsOrphan(State state) { return false; } - - @Override - public default boolean pull() { - for (boolean incomplete = Mutable.super.pull(); incomplete; incomplete = Mutable.super.pull()) { - } - return false; - } } diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 2b2beded..24a81363 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -83,7 +83,8 @@ public class UniverseTransaction extends MutableTransaction { protected final AtomicReference> errors = new AtomicReference<>(Set.of()); private final AtomicReference> inconsistencies = new AtomicReference<>(Set.of()); private final AtomicReference orphansDetected = new AtomicReference<>(null); - private final ConstantState constantState = new ConstantState("CONST", this::handleException); + private final ConstantState constantState; + private final ConstantState pullConstantState; private final StatusProvider statusProvider; private final Timer timer = new Timer("UniverseTransactionTimer", true); private final MutableStates preStartStates; @@ -164,15 +165,17 @@ public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig con } public UniverseTransaction(Universe universe, ContextPool pool, DclareConfig config, Consumer startStatusConsumer) { - this(universe, pool, false, config, startStatusConsumer, null); + this(universe, pool, false, config, startStatusConsumer, null, null); } - public UniverseTransaction(Universe universe, ContextPool pool, boolean pull, DclareConfig config, Consumer startStatusConsumer, StateMap startStateMap) { + public UniverseTransaction(Universe universe, ContextPool pool, boolean pull, DclareConfig config, Consumer startStatusConsumer, StateMap startStateMap, ConstantState startConstantState) { super(null); - this.pull = pull; if (universe == null) { throw new IllegalArgumentException("UniverseTransaction can not start without a Universe (universe argument is null)"); } + this.pull = pull; + this.constantState = startConstantState != null ? startConstantState : new ConstantState("CONST", this::handleException); + this.pullConstantState = pull ? new ConstantState("PULL", this::handleException) : null; State initState = createStartState(universe, startStateMap); startState = initState.get(() -> incrementChangeId(universe, initState)); Status startStatus = new Status(Mood.starting, null, startState, null, Set.of()); @@ -273,7 +276,7 @@ public void run() { } runActions(preActions); runAction(action); - if (initialized) { + if (initialized && push()) { runAction(checkConsistency); } handleTooManyChanges(state); @@ -628,7 +631,7 @@ protected void clearOrphans(Universe universe) { return o instanceof Mutable && ((Mutable) o).dIsOrphan(postState) && !tx.toBeCleared((Mutable) o).isEmpty(); }).map(e -> (Mutable) e.getKey()).asSet(); orphansDetected.set(!orphans.isEmpty()); - orphans.forEach(tx::clearOrphan); + orphans.forEach(tx::dDeactivate); } public boolean isStopped(State state) { @@ -831,6 +834,10 @@ public ConstantState constantState() { return constantState; } + public ConstantState pullConstantState() { + return pullConstantState; + } + public TransactionId setPreserved(O object, Setable property, T post, Action action) { TransactionId txid = startState(Priority.OUTER).transactionId(); for (int i = 0; i < startStates.length() - 1; i++) { From bf5e0856b5f53710638e6e41bc0fb50d6522aac1 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 13 Mar 2024 09:05:01 +0100 Subject: [PATCH 035/179] rename --- .../dclare/AbstractDerivationTransaction.java | 4 +- .../dclare/ActionTransaction.java | 56 +++++++++---------- .../modelingvalue/dclare/ConstantState.java | 28 +++++----- ...angeHandler.java => ILeafTransaction.java} | 2 +- .../modelingvalue/dclare/LeafTransaction.java | 2 +- .../java/org/modelingvalue/dclare/State.java | 2 +- 6 files changed, 47 insertions(+), 47 deletions(-) rename src/main/java/org/modelingvalue/dclare/{ConstantChangeHandler.java => ILeafTransaction.java} (98%) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 6057ea1e..e707aa04 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -52,9 +52,9 @@ protected AbstractDerivationTransaction(UniverseTransaction universeTransaction) } private ConstantState memoization; - private ConstantChangeHandler changeHandler; + private ILeafTransaction changeHandler; - public R derive(Supplier action, State state, ConstantState memoization, ConstantChangeHandler changeHandler) { + public R derive(Supplier action, State state, ConstantState memoization, ILeafTransaction changeHandler) { this.memoization = memoization; this.changeHandler = changeHandler; try { diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index d9621a65..9343356c 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -39,36 +39,36 @@ import org.modelingvalue.dclare.ex.TransactionException; public class ActionTransaction extends LeafTransaction implements StateMergeHandler { - private final CurrentState currentState = new CurrentState(); - private final ConstantChangeHandler changeHandler = new ConstantChangeHandler() { - @Override - public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { - ActionTransaction.this.set(object, setable, preValue, postValue); - } - - @Override - public State state() { - return ActionTransaction.this.state(); - } - - @Override - public T set(O object, Setable property, T post) { - return ActionTransaction.this.set(object, property, post); - } - - @Override - public void trigger(O mutable, Action action, Priority priority) { - ActionTransaction.this.trigger(mutable, action, priority); - } - }; + private final CurrentState currentState = new CurrentState(); + private final ILeafTransaction changeHandler = new ILeafTransaction() { + @Override + public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { + ActionTransaction.this.set(object, setable, preValue, postValue); + } + + @Override + public State state() { + return ActionTransaction.this.state(); + } + + @Override + public T set(O object, Setable property, T post) { + return ActionTransaction.this.set(object, property, post); + } + + @Override + public void trigger(O mutable, Action action, Priority priority) { + ActionTransaction.this.trigger(mutable, action, priority); + } + }; @SuppressWarnings("unchecked") - private final Supplier supplier = () -> { - ((Action) action()).run(mutable()); - return null; - }; + private final Supplier supplier = () -> { + ((Action) action()).run(mutable()); + return null; + }; - private State preState; - private State postState; + private State preState; + private State postState; protected ActionTransaction(UniverseTransaction universeTransaction) { super(universeTransaction); diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index c40432f6..5f888f4d 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -156,7 +156,7 @@ public O object() { } @SuppressWarnings("unchecked") - public V get(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { + public V get(ILeafTransaction cch, O object, Constant constant, Function deriver) { Map, Object> prev = constants; V ist = (V) prev.get(constant); if (ist == null) { @@ -171,7 +171,7 @@ public boolean isSet(Constant constant) { } @SuppressWarnings("unchecked") - public V getOrSet(ConstantChangeHandler cch, O object, Constant constant, V soll) { + public V getOrSet(ILeafTransaction cch, O object, Constant constant, V soll) { Map, Object> prev = constants; V ist = (V) prev.get(constant); if (ist == null) { @@ -181,7 +181,7 @@ public V getOrSet(ConstantChangeHandler cch, O object, Constant consta } @SuppressWarnings("unchecked") - public V set(ConstantChangeHandler cch, O object, Constant constant, V soll, boolean forced) { + public V set(ILeafTransaction cch, O object, Constant constant, V soll, boolean forced) { Map, Object> prev = constants; V ist = (V) prev.get(constant); if (ist == null || forced) { @@ -194,7 +194,7 @@ public V set(ConstantChangeHandler cch, O object, Constant constant, V } @SuppressWarnings("unchecked") - public V set(ConstantChangeHandler cch, O object, Constant constant, BiFunction function, E element) { + public V set(ILeafTransaction cch, O object, Constant constant, BiFunction function, E element) { Map, Object> prev = constants; V ist = (V) prev.get(constant); V soll = function.apply(ist, element); @@ -224,7 +224,7 @@ public String toString() { } @SuppressWarnings("unchecked") - private V set(ConstantChangeHandler cch, O object, Constant constant, Map, Object> prev, V soll, boolean forced) { + private V set(ILeafTransaction cch, O object, Constant constant, Map, Object> prev, V soll, boolean forced) { V ist; Map, Object> next = prev.put(constant, soll); while (!UPDATOR.compareAndSet(this, prev, next)) { @@ -243,7 +243,7 @@ private V set(ConstantChangeHandler cch, O object, Constant constant, } @SuppressWarnings({"unchecked", "resource"}) - private V derive(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { + private V derive(ILeafTransaction cch, O object, Constant constant, Function deriver) { List> list = List.of(); while (true) { try { @@ -304,31 +304,31 @@ public void stop() { remover.interrupt(); } - public V get(ConstantChangeHandler cch, O object, Constant constant) { + public V get(ILeafTransaction cch, O object, Constant constant) { return getConstants(cch, object, referenceType(constant)).get(cch, object, constant, constant.deriver()); } - public O object(ConstantChangeHandler cch, O object) { + public O object(ILeafTransaction cch, O object) { return getConstants(cch, object, ReferenceType.weak).object(); } - public V get(ConstantChangeHandler cch, O object, Constant constant, Function deriver) { + public V get(ILeafTransaction cch, O object, Constant constant, Function deriver) { return getConstants(cch, object, referenceType(constant)).get(cch, object, constant, deriver); } - public boolean isSet(ConstantChangeHandler cch, O object, Constant constant) { + public boolean isSet(ILeafTransaction cch, O object, Constant constant) { return getConstants(cch, object, referenceType(constant)).isSet(constant); } - public V getOrSet(ConstantChangeHandler cch, O object, Constant constant, V value) { + public V getOrSet(ILeafTransaction cch, O object, Constant constant, V value) { return getConstants(cch, object, referenceType(constant)).getOrSet(cch, object, constant, value); } - public V set(ConstantChangeHandler cch, O object, Constant constant, V value, boolean forced) { + public V set(ILeafTransaction cch, O object, Constant constant, V value, boolean forced) { return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, value, forced); } - public V set(ConstantChangeHandler cch, O object, Constant constant, BiFunction deriver, E element) { + public V set(ILeafTransaction cch, O object, Constant constant, BiFunction deriver, E element) { return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, deriver, element); } @@ -337,7 +337,7 @@ private ReferenceType referenceType(Constant constant) { } @SuppressWarnings("unchecked") - private Constants getConstants(ConstantChangeHandler cch, O object, ReferenceType referenceType) { + private Constants getConstants(ILeafTransaction cch, O object, ReferenceType referenceType) { QualifiedSet prev = state.get(); Constants constants = prev.get(object); if (constants == null) { diff --git a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java similarity index 98% rename from src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java rename to src/main/java/org/modelingvalue/dclare/ILeafTransaction.java index 9ce888dc..afe7dee4 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantChangeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java @@ -20,7 +20,7 @@ package org.modelingvalue.dclare; -public interface ConstantChangeHandler { +public interface ILeafTransaction { void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue); diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index 90ffd42c..b296b185 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -36,7 +36,7 @@ import org.modelingvalue.collections.util.Context; @SuppressWarnings("unused") -public abstract class LeafTransaction extends Transaction implements ConstantChangeHandler { +public abstract class LeafTransaction extends Transaction implements ILeafTransaction { private static final Context CURRENT = Context.of(); diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index b3342492..475a46f6 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -272,7 +272,7 @@ public R derive(Supplier supplier, ConstantState constantState) { } } - public R derive(Supplier supplier, ConstantState constantState, ConstantChangeHandler changeHandler) { + public R derive(Supplier supplier, ConstantState constantState, ILeafTransaction changeHandler) { DerivationTransaction tx = universeTransaction.derivation.openTransaction(universeTransaction); try { return tx.derive(supplier, this, constantState, changeHandler); From b6922cd6bd439c8c24496b9b0bb3d9ff58642e12 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 13 Mar 2024 09:05:08 +0100 Subject: [PATCH 036/179] rename --- .../dclare/AbstractDerivationTransaction.java | 32 +++++++++---------- .../java/org/modelingvalue/dclare/State.java | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index e707aa04..29ccc3b9 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -51,12 +51,12 @@ protected AbstractDerivationTransaction(UniverseTransaction universeTransaction) super(universeTransaction); } - private ConstantState memoization; - private ILeafTransaction changeHandler; + private ConstantState memoization; + private ILeafTransaction iLeafTransaction; - public R derive(Supplier action, State state, ConstantState memoization, ILeafTransaction changeHandler) { + public R derive(Supplier action, State state, ConstantState memoization, ILeafTransaction iLeafTransaction) { this.memoization = memoization; - this.changeHandler = changeHandler; + this.iLeafTransaction = iLeafTransaction; try { return get(action, state); } catch (Throwable t) { @@ -64,7 +64,7 @@ public R derive(Supplier action, State state, ConstantState memoization, return null; } finally { this.memoization = null; - this.changeHandler = null; + this.iLeafTransaction = null; } } @@ -104,7 +104,7 @@ private T derive(O object, Getable getable, T nonDerived) { Constant constant = observed.constant(); if (isDerived && outerDerivedValue.isSet()) { return outerDerivedValue.get(); - } else if (!mem.isSet(changeHandler, object, constant)) { + } else if (!mem.isSet(iLeafTransaction, object, constant)) { if (Newable.D_ALL_DERIVATIONS.equals(observed) || Mutable.D_PARENT_CONTAINING.equals(observed)) { return nonDerived; } else { @@ -130,7 +130,7 @@ private T derive(O object, Getable getable, T nonDerived) { setInMemoization(mem, object, observed, innerDerivedValue.get(), false); } }))); - if (!mem.isSet(changeHandler, object, constant)) { + if (!mem.isSet(iLeafTransaction, object, constant)) { if (isTraceDerivation(object, observed)) { INDENT.run(INDENT.get() + 1, () -> runNonDeriving(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); } @@ -139,7 +139,7 @@ private T derive(O object, Getable getable, T nonDerived) { } } } - return mem.get(changeHandler, object, constant); + return mem.get(iLeafTransaction, object, constant); } else { return nonDerived; } @@ -193,7 +193,7 @@ private T set(O object, Setable setable, T post, T nonDerived) { boolean isDerived = derivedValue != null && derivedValue.isDerived(object, observed); ConstantState mem = memoization(object); Constant constant = observed.constant(); - T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(changeHandler, object, constant) ? mem.get(changeHandler, object, constant) : nonDerived; + T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(iLeafTransaction, object, constant) ? mem.get(iLeafTransaction, object, constant) : nonDerived; T result = match(mem, observed, pre, post); if (isDerived) { derivedValue.set(result); @@ -214,7 +214,7 @@ Setable. diff(pre, result, added -> { } return pre; } else if (!Objects.equals(nonDerived, post)) { - return changeHandler == this ? super.set(object, setable, post) : changeHandler.set(object, setable, post); + return iLeafTransaction == this ? super.set(object, setable, post) : iLeafTransaction.set(object, setable, post); } else { return post; } @@ -227,21 +227,21 @@ private T match(ConstantState mem, Setable setable, T pre, T post) if (!pres.isEmpty()) { for (Newable po : posts) { Construction poInit = Mutable.D_INITIAL_CONSTRUCTION.get(po); - if (poInit.isDerived() && mem.isSet(changeHandler, po, Newable.D_ALL_DERIVATIONS.constant())) { + if (poInit.isDerived() && mem.isSet(iLeafTransaction, po, Newable.D_ALL_DERIVATIONS.constant())) { for (Newable pr : pres) { Construction preInit = Mutable.D_INITIAL_CONSTRUCTION.get(pr); if (preInit.isDirect() && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { pres = pres.remove(pr); post = replace(post, po, pr); - setInMemoization(mem, pr, Mutable.D_ALL_DERIVATIONS, mem.get(changeHandler, po, Newable.D_ALL_DERIVATIONS.constant()), true); + setInMemoization(mem, pr, Mutable.D_ALL_DERIVATIONS, mem.get(iLeafTransaction, po, Newable.D_ALL_DERIVATIONS.constant()), true); } } } else if (poInit.isDirect()) { for (Newable pr : pres) { Construction preInit = Mutable.D_INITIAL_CONSTRUCTION.get(pr); - if (preInit.isDerived() && mem.isSet(changeHandler, pr, Newable.D_ALL_DERIVATIONS.constant()) && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { + if (preInit.isDerived() && mem.isSet(iLeafTransaction, pr, Newable.D_ALL_DERIVATIONS.constant()) && po.dNewableType().equals(pr.dNewableType()) && Objects.equals(po.dIdentity(), pr.dIdentity())) { pres = pres.remove(pr); - setInMemoization(mem, po, Mutable.D_ALL_DERIVATIONS, mem.get(changeHandler, pr, Newable.D_ALL_DERIVATIONS.constant()), true); + setInMemoization(mem, po, Mutable.D_ALL_DERIVATIONS, mem.get(iLeafTransaction, pr, Newable.D_ALL_DERIVATIONS.constant()), true); } } } @@ -263,7 +263,7 @@ private T replace(T post, Newable po, Newable pr) { @Override public void trigger(O mutable, Action action, Priority priority) { - changeHandler.trigger(mutable, action, priority); + iLeafTransaction.trigger(mutable, action, priority); } @Override @@ -283,7 +283,7 @@ public O construct(Reason reason, Supplier supplier) { } protected T setInMemoization(ConstantState mem, O object, Setable setable, T result, boolean force) { - return force ? mem.set(changeHandler, object, setable.constant(), result, force) : mem.getOrSet(changeHandler, object, setable.constant(), result); + return force ? mem.set(iLeafTransaction, object, setable.constant(), result, force) : mem.getOrSet(iLeafTransaction, object, setable.constant(), result); } protected ConstantState memoization(O object) { diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 475a46f6..edf79c27 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -272,10 +272,10 @@ public R derive(Supplier supplier, ConstantState constantState) { } } - public R derive(Supplier supplier, ConstantState constantState, ILeafTransaction changeHandler) { + public R derive(Supplier supplier, ConstantState constantState, ILeafTransaction iLeafTransaction) { DerivationTransaction tx = universeTransaction.derivation.openTransaction(universeTransaction); try { - return tx.derive(supplier, this, constantState, changeHandler); + return tx.derive(supplier, this, constantState, iLeafTransaction); } finally { universeTransaction.derivation.closeTransaction(tx); } From 6024e00895740297973d08252874bd2328c6f699 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Mar 2024 12:08:28 +0100 Subject: [PATCH 037/179] render json from state in readonly transaction on that state --- .../org/modelingvalue/dclare/StateToJson.java | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index 294a9096..ba49fb7b 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -20,6 +20,13 @@ package org.modelingvalue.dclare; +import java.util.AbstractMap.SimpleEntry; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.function.Predicate; + import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.List; import org.modelingvalue.collections.QualifiedSet; @@ -28,18 +35,11 @@ import org.modelingvalue.dclare.sync.Util; import org.modelingvalue.json.ToJson; -import java.util.AbstractMap.SimpleEntry; -import java.util.Comparator; -import java.util.Iterator; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.function.Predicate; - @SuppressWarnings({"rawtypes", "unused"}) public class StateToJson extends ToJson { - public static final String ID_FIELD_NAME = "@id"; - public static final String ID_REF_FIELD_NAME = "@idref"; - public static final String NAME_FIELD_NAME = "name"; + public static final String ID_FIELD_NAME = "@id"; + public static final String ID_REF_FIELD_NAME = "@idref"; + public static final String NAME_FIELD_NAME = "name"; private static final Comparator> FIELD_SORTER = ((Comparator>) (e1, e2) -> isNameOrId(e1) ? -1 : isNameOrId(e2) ? +1 : 0).thenComparing(e -> e.getKey().toString()); private static boolean isNameOrId(Entry e) { @@ -62,6 +62,11 @@ public State getState() { return state; } + @Override + public String render() { + return state.get(super::render); + } + public boolean renderIdFor(Mutable mutable) { return true; } @@ -87,11 +92,11 @@ protected Iterator> getMapIterator(Object o) { List> entries; if (o instanceof Mutable mutable) { Collection> stream = mutable.dClass().dSetables() // - .filter(getSetableFilter()) // - .map(setable -> Pair.of(setable, state.get(mutable, (Setable) setable))) // - .filter(pair -> !Objects.equals(pair.b(), ((Setable) pair.a()).getDefault(mutable))) // - .map(pair -> (Entry) new SimpleEntry<>((Object) renderTag(pair.a()), renderValue(o, pair.a(), pair.b()))) // - .sorted(FIELD_SORTER); + .filter(getSetableFilter()) // + .map(setable -> Pair.of(setable, state.get(mutable, (Setable) setable))) // + .filter(pair -> !Objects.equals(pair.b(), ((Setable) pair.a()).getDefault(mutable))) // + .map(pair -> (Entry) new SimpleEntry<>((Object) renderTag(pair.a()), renderValue(o, pair.a(), pair.b()))) // + .sorted(FIELD_SORTER); if (renderIdFor(mutable)) { Collection> idEntry = Collection.of(new SimpleEntry<>(ID_FIELD_NAME, getId(mutable))); stream = Collection.concat(idEntry, stream); @@ -100,9 +105,9 @@ protected Iterator> getMapIterator(Object o) { } else if (o instanceof QualifiedSet) { QualifiedSet q = (QualifiedSet) o; entries = q.toKeys() // - .map(k -> (Entry) new SimpleEntry<>(k, q.get(k))) // - .sortedBy(e -> e.getKey().toString()) // - .asList(); + .map(k -> (Entry) new SimpleEntry<>(k, q.get(k))) // + .sortedBy(e -> e.getKey().toString()) // + .asList(); } else { throw new RuntimeException("this should not be reachable"); } From 1acfdf5a47b187b4000954fd02679c9a790d6887 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 29 Mar 2024 15:57:42 +0100 Subject: [PATCH 038/179] opposite fix when pulling --- .../dclare/AbstractDerivationTransaction.java | 20 +++++++++++------ .../dclare/ActionTransaction.java | 12 +++++++--- .../modelingvalue/dclare/LeafTransaction.java | 4 ++-- .../dclare/ObserverTransaction.java | 22 +++++++++---------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 29ccc3b9..1469f5e6 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -113,12 +113,12 @@ private T derive(O object, Getable getable, T nonDerived) { Set> newDerived = oldDerived.add(derived); if (oldDerived == newDerived) { if (isTraceDerivation(object, observed)) { - runNonDeriving(() -> System.err.println(tracePre(object) + "RECU " + object + "." + observed + " => RECURSIVE DERIVATION, result is the non-derived value: " + nonDerived)); + runSilent(() -> System.err.println(tracePre(object) + "RECU " + object + "." + observed + " => RECURSIVE DERIVATION, result is the non-derived value: " + nonDerived)); } return nonDerived; } else { if (isTraceDerivation(object, observed)) { - runNonDeriving(() -> System.err.println(tracePre(object) + ">>>> " + object + "." + observed)); + runSilent(() -> System.err.println(tracePre(object) + ">>>> " + object + "." + observed)); } DerivedValue innerDerivedValue = new DerivedValue(object, observed); INDENT.run(INDENT.get() + 1, () -> DERIVED.run(newDerived, () -> DERIVED_VALUE.run(innerDerivedValue, () -> { @@ -132,7 +132,7 @@ private T derive(O object, Getable getable, T nonDerived) { }))); if (!mem.isSet(iLeafTransaction, object, constant)) { if (isTraceDerivation(object, observed)) { - INDENT.run(INDENT.get() + 1, () -> runNonDeriving(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); + INDENT.run(INDENT.get() + 1, () -> runSilent(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); } return nonDerived; } @@ -148,14 +148,14 @@ private T derive(O object, Getable getable, T nonDerived) { @SuppressWarnings({"rawtypes", "unchecked"}) protected void runDeriver(Mutable mutable, Observed observed, Observer observer, int i) { if (isTraceDerivation(mutable, observed)) { - runNonDeriving(() -> System.err.println(tracePre(mutable) + String.format(">>%d> ", i) + mutable + "." + observer + "()")); + runSilent(() -> System.err.println(tracePre(mutable) + String.format(">>%d> ", i) + mutable + "." + observer + "()")); } INDENT.run(INDENT.get() + 1, () -> DERIVER.run(Pair.of(mutable, observer), () -> { try { observer.run(mutable); } catch (Throwable t) { if (isTraceDerivation(mutable, observed)) { - runNonDeriving(() -> System.err.println(tracePre(mutable) + "!!!! " + mutable + "." + observer + "() => THROWS " + t)); + runSilent(() -> System.err.println(tracePre(mutable) + "!!!! " + mutable + "." + observer + "() => THROWS " + t)); } universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); } @@ -181,10 +181,16 @@ public T set(O object, Setable setable, T post) { return set(object, setable, post, nonDerived); } - public void runNonDeriving(Runnable action) { + @Override + public void runSilent(Runnable action) { DERIVE.run(false, action); } + @Override + public R getSilent(Supplier action) { + return DERIVE.get(false, action); + } + @SuppressWarnings({"unchecked", "rawtypes"}) private T set(O object, Setable setable, T post, T nonDerived) { if (doDeriveSet(object, setable, nonDerived)) { @@ -201,7 +207,7 @@ private T set(O object, Setable setable, T post, T nonDerived) { setInMemoization(mem, object, observed, result, false); } if (isTraceDerivation(object, observed)) { - runNonDeriving(() -> { + runSilent(() -> { Pair deriver = DERIVER.get(); System.err.println(tracePre(object) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); }); diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 9343356c..473a8dc3 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -41,9 +41,14 @@ public class ActionTransaction extends LeafTransaction implements StateMergeHandler { private final CurrentState currentState = new CurrentState(); private final ILeafTransaction changeHandler = new ILeafTransaction() { + @SuppressWarnings("unchecked") @Override public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { - ActionTransaction.this.set(object, setable, preValue, postValue); + ActionTransaction.this.changed(object, setable, preValue, rawPreValue, postValue); + if (setable.id() instanceof Observed) { + // LeafTransaction.getCurrent().runSilent(() -> System.err.println("PULL " + object + "." + setable + "=" + postValue)); + ActionTransaction.this.set(object, (Observed) setable.id(), preValue, postValue); + } } @Override @@ -53,6 +58,7 @@ public State state() { @Override public T set(O object, Setable property, T post) { + // LeafTransaction.getCurrent().runSilent(() -> System.err.println("PUSH " + object + "." + property + "=" + post)); return ActionTransaction.this.set(object, property, post); } @@ -100,7 +106,7 @@ protected final State run(State pre) { postState = currentState.merge(); Map>> diff = preState.diff(postState, o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).asMap(e -> e); if (!diff.isEmpty()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (" + postState.shortDiffString(diff, mutable()) + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (" + postState.shortDiffString(diff, mutable()) + ")")); } } else { postState = currentState.result(); @@ -217,7 +223,7 @@ private void trigger(O object, Observed observed) { Priority priority = observer.fixpointGroup() == fixpointGroup() ? observer.initPriority() : Priority.five; trigger(target, observer, priority); if (universeTransaction().getConfig().isTraceMutable()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (TRIGGER " + target + "." + observer + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable() + "." + action() + " (TRIGGER " + target + "." + observer + ")")); } } } diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index b296b185..b7f79e17 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -175,11 +175,11 @@ protected Mutable dParent(Mutable object) { return state().getA(object, Mutable.D_PARENT_CONTAINING); } - public void runNonObserving(Runnable action) { + public void runSilent(Runnable action) { action.run(); } - public T getNonObserving(Supplier action) { + public T getSilent(Supplier action) { return action.get(); } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index f7e1a2e3..eab321cb 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -171,7 +171,7 @@ private void finish(State pre, Observer observer) { } if (throwable != null) { if (universeTransaction().getConfig().isTraceActions()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable + "." + observer() + " (" + throwable.b() + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("DCLARE", this) + mutable + "." + observer() + " (" + throwable.b() + ")")); } if (throwable.b() instanceof NullPointerException && emptyMandatory.get().equals(TRUE)) { throwable = null; @@ -292,7 +292,7 @@ protected void set(O object, Setable setable, T pre, T post) { observe(object, (Observed) setable); if (!setable.isPlumbing() && !Objects.equals(pre, post)) { merge(); - result = getNonObserving(() -> { + result = getSilent(() -> { if (pre instanceof Newable || post instanceof Newable) { return (T) singleMatch((Mutable) object, (Observed) setable, pre, post); } else if (isCollection(pre) && isCollection(post) && (isNewableCollection(pre) || isNewableCollection(post))) { @@ -326,20 +326,20 @@ public void handleMergeConflict(Object object, Setable property, Object pre, Obj } @Override - public void runNonObserving(Runnable action) { + public void runSilent(Runnable action) { if (observeds.isInitialized()) { OBSERVE.run(false, action); } else { - super.runNonObserving(action); + super.runSilent(action); } } @Override - public T getNonObserving(Supplier action) { + public T getSilent(Supplier action) { if (observeds.isInitialized()) { return OBSERVE.get(false, action); } else { - return super.getNonObserving(action); + return super.getSilent(action); } } @@ -349,7 +349,7 @@ public void changed(O object, Setable setable, T preValue, T rawPre if (observing(object, setable)) { changed.set(TRUE); } - runNonObserving(() -> super.changed(object, setable, preValue, rawPreValue, postValue)); + runSilent(() -> super.changed(object, setable, preValue, rawPreValue, postValue)); } private boolean observing(O object, Getable setable) { @@ -568,7 +568,7 @@ private boolean isChangedBack(O object, Observed observed, T pre, T private void traceRippleOut(O object, Feature feature, Object post, Object result) { if (universeTransaction().getConfig().isTraceRippleOut()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("DEFER", this) + mutable() + "." + observer() + // + runSilent(() -> System.err.println(DclareTrace.getLineStart("DEFER", this) + mutable() + "." + observer() + // " " + deferPriorityName() + " (" + object + "." + feature + "=" + result + "<-" + post + ")")); } } @@ -608,7 +608,7 @@ private Object singleMatch(Mutable object, Observed observed, Object before, Obj } } if (!found && universeTransaction().getConfig().isTraceMatching()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable() + "." + observer() + " (" + preInfo + "!=" + postInfo + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable() + "." + observer() + " (" + preInfo + "!=" + postInfo + ")")); } } } @@ -665,7 +665,7 @@ private Object manyMatch(Mutable object, Observed observed, ContainingCollection break; } else if (universeTransaction().getConfig().isTraceMatching()) { MatchInfo finalPostInfo = postInfo; - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable() + "." + observer() + " (" + preInfo + "!=" + finalPostInfo + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable() + "." + observer() + " (" + preInfo + "!=" + finalPostInfo + ")")); } } } @@ -685,7 +685,7 @@ private void replace(MatchInfo replaced, MatchInfo replacing) { Mutable mutable = mutable(); Observer observer = observer(); if (universeTransaction().getConfig().isTraceMatching()) { - runNonObserving(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable + "." + observer + " (" + replacing + "==" + replaced + ")")); + runSilent(() -> System.err.println(DclareTrace.getLineStart("MATCH", this) + mutable + "." + observer + " (" + replacing + "==" + replaced + ")")); } if (Mutable.D_INITIAL_CONSTRUCTION.get(replacing.newable()).isDirect()) { super.set(replaced.newable(), Newable.D_REPLACING, Newable.D_REPLACING.getDefault(replaced.newable()), replacing.newable()); From 0faf467bac88d930f5cc8a474d782af107e464d4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 1 Apr 2024 14:09:47 +0200 Subject: [PATCH 039/179] cycle warnings when pulling --- .../dclare/AbstractDerivationTransaction.java | 132 +++++++++++------- 1 file changed, 80 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 1469f5e6..971a55f7 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -35,16 +35,16 @@ public abstract class AbstractDerivationTransaction extends ReadOnlyTransaction { @SuppressWarnings("rawtypes") - protected static final Context>> DERIVED = Context.of(Set.of()); + protected static final Context> ALL_DERIVED = Context.of(Set.of()); @SuppressWarnings("rawtypes") - protected static final Context> DERIVER = Context.of(null); + protected static final Context> DERIVER = Context.of(null); @SuppressWarnings("rawtypes") - private static final Context DERIVED_VALUE = Context.of(null); - private static final Context INDENT = Context.of(0); - private static final Context DERIVE = Context.of(true); + private static final Context DERIVED = Context.of(null); + private static final Context INDENT = Context.of(0); + private static final Context DERIVE = Context.of(true); public static boolean isDeriving() { - return !DERIVED.get().isEmpty(); + return !ALL_DERIVED.get().isEmpty(); } protected AbstractDerivationTransaction(UniverseTransaction universeTransaction) { @@ -98,48 +98,51 @@ protected T current(O object, Getable getable) { private T derive(O object, Getable getable, T nonDerived) { if (doDeriveGet(object, getable, nonDerived)) { Observed observed = (Observed) getable; - DerivedValue outerDerivedValue = DERIVED_VALUE.get(); - boolean isDerived = outerDerivedValue != null && outerDerivedValue.isDerived(object, observed); - ConstantState mem = memoization(object); - Constant constant = observed.constant(); - if (isDerived && outerDerivedValue.isSet()) { - return outerDerivedValue.get(); - } else if (!mem.isSet(iLeafTransaction, object, constant)) { - if (Newable.D_ALL_DERIVATIONS.equals(observed) || Mutable.D_PARENT_CONTAINING.equals(observed)) { - return nonDerived; - } else { - Pair derived = Pair.of((Mutable) object, observed); - Set> oldDerived = DERIVED.get(); - Set> newDerived = oldDerived.add(derived); - if (oldDerived == newDerived) { - if (isTraceDerivation(object, observed)) { - runSilent(() -> System.err.println(tracePre(object) + "RECU " + object + "." + observed + " => RECURSIVE DERIVATION, result is the non-derived value: " + nonDerived)); - } + Derived outerDerived = DERIVED.get(); + boolean isDerived = outerDerived != null && outerDerived.isDerived(object, observed); + if (isDerived && outerDerived.isSet()) { + return outerDerived.get(); + } else { + ConstantState mem = memoization(object); + Constant constant = observed.constant(); + if (!mem.isSet(iLeafTransaction, object, constant)) { + if (isDerived || Newable.D_ALL_DERIVATIONS.equals(observed) || Mutable.D_PARENT_CONTAINING.equals(observed)) { return nonDerived; } else { - if (isTraceDerivation(object, observed)) { - runSilent(() -> System.err.println(tracePre(object) + ">>>> " + object + "." + observed)); - } - DerivedValue innerDerivedValue = new DerivedValue(object, observed); - INDENT.run(INDENT.get() + 1, () -> DERIVED.run(newDerived, () -> DERIVED_VALUE.run(innerDerivedValue, () -> { - int i = 0; - for (Observer observer : ((Mutable) object).dAllDerivers(observed)) { - runDeriver((Mutable) object, observed, observer, ++i); + Derived innerDerived = new Derived(object, observed, outerDerived); + Set oldAllDerived = ALL_DERIVED.get(); + if (oldAllDerived.contains(innerDerived)) { + if (pull() && !observed.synthetic()) { + runSilent(() -> System.err.println(tracePre(object, null) + "CYCLE " + innerDerived)); } - if (innerDerivedValue.isSet()) { - setInMemoization(mem, object, observed, innerDerivedValue.get(), false); - } - }))); - if (!mem.isSet(iLeafTransaction, object, constant)) { if (isTraceDerivation(object, observed)) { - INDENT.run(INDENT.get() + 1, () -> runSilent(() -> System.err.println(tracePre(object) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); + runSilent(() -> System.err.println(tracePre(object, this) + "RECU " + object + "." + observed + " => RECURSIVE DERIVATION, result is the non-derived value: " + nonDerived)); } return nonDerived; + } else { + if (isTraceDerivation(object, observed)) { + runSilent(() -> System.err.println(tracePre(object, this) + ">>>> " + object + "." + observed)); + } + INDENT.run(INDENT.get() + 1, () -> ALL_DERIVED.run(oldAllDerived.add(innerDerived), () -> DERIVED.run(innerDerived, () -> { + int i = 0; + for (Observer observer : ((Mutable) object).dAllDerivers(observed)) { + runDeriver((Mutable) object, observed, observer, ++i); + } + if (innerDerived.isSet()) { + setInMemoization(mem, object, observed, innerDerived.get(), false); + } + }))); + if (!mem.isSet(iLeafTransaction, object, constant)) { + if (isTraceDerivation(object, observed)) { + INDENT.run(INDENT.get() + 1, () -> runSilent(() -> System.err.println(tracePre(object, this) + "NODR " + object + "." + observed + " => NO DERIVATION, result is the non-derived value: " + nonDerived))); + } + return nonDerived; + } } } } + return mem.get(iLeafTransaction, object, constant); } - return mem.get(iLeafTransaction, object, constant); } else { return nonDerived; } @@ -148,14 +151,14 @@ private T derive(O object, Getable getable, T nonDerived) { @SuppressWarnings({"rawtypes", "unchecked"}) protected void runDeriver(Mutable mutable, Observed observed, Observer observer, int i) { if (isTraceDerivation(mutable, observed)) { - runSilent(() -> System.err.println(tracePre(mutable) + String.format(">>%d> ", i) + mutable + "." + observer + "()")); + runSilent(() -> System.err.println(tracePre(mutable, this) + String.format(">>%d> ", i) + mutable + "." + observer + "()")); } INDENT.run(INDENT.get() + 1, () -> DERIVER.run(Pair.of(mutable, observer), () -> { try { observer.run(mutable); } catch (Throwable t) { if (isTraceDerivation(mutable, observed)) { - runSilent(() -> System.err.println(tracePre(mutable) + "!!!! " + mutable + "." + observer + "() => THROWS " + t)); + runSilent(() -> System.err.println(tracePre(mutable, this) + "!!!! " + mutable + "." + observer + "() => THROWS " + t)); } universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); } @@ -195,21 +198,21 @@ public R getSilent(Supplier action) { private T set(O object, Setable setable, T post, T nonDerived) { if (doDeriveSet(object, setable, nonDerived)) { Observed observed = (Observed) setable; - DerivedValue derivedValue = DERIVED_VALUE.get(); - boolean isDerived = derivedValue != null && derivedValue.isDerived(object, observed); + Derived derived = DERIVED.get(); + boolean isDerived = derived != null && derived.isDerived(object, observed); ConstantState mem = memoization(object); Constant constant = observed.constant(); - T pre = isDerived && derivedValue.isSet() ? derivedValue.get() : mem.isSet(iLeafTransaction, object, constant) ? mem.get(iLeafTransaction, object, constant) : nonDerived; + T pre = isDerived && derived.isSet() ? derived.get() : mem.isSet(iLeafTransaction, object, constant) ? mem.get(iLeafTransaction, object, constant) : nonDerived; T result = match(mem, observed, pre, post); if (isDerived) { - derivedValue.set(result); + derived.set(result); } else { setInMemoization(mem, object, observed, result, false); } if (isTraceDerivation(object, observed)) { runSilent(() -> { Pair deriver = DERIVER.get(); - System.err.println(tracePre(object) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); + System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); }); } if (observed.containment()) { @@ -305,8 +308,8 @@ protected boolean isTraceDerivation(O object, Setable setable) { return (setable == null || !setable.isPlumbing()) && universeTransaction().getConfig().isTraceDerivation(); } - private String tracePre(O object) { - return DclareTrace.getLineStart(memoization(object).toString(), this); + private String tracePre(O object, Transaction transaction) { + return DclareTrace.getLineStart(memoization(object).toString(), transaction); } @Override @@ -314,13 +317,17 @@ public int depth() { return INDENT.get(); } - protected static class DerivedValue extends Pair> { - private static final long serialVersionUID = -2566539820227398813L; + protected static class Derived extends Pair> { + private static final long serialVersionUID = -2566539820227398813L; - private T value; + @SuppressWarnings("rawtypes") + private final Derived outer; + private T value; - protected DerivedValue(O a, Observed b) { + @SuppressWarnings("rawtypes") + protected Derived(O a, Observed b, Derived outer) { super(a, b); + this.outer = outer; } protected T get() { @@ -336,10 +343,31 @@ protected boolean isSet() { return value != null; } - protected boolean isDerived(O object, Observed observed) { + protected boolean isDerived(Object object, Observed observed) { return a().equals(object) && b().equals(observed); } + @SuppressWarnings("rawtypes") + protected Derived outer() { + return outer; + } + + @SuppressWarnings("rawtypes") + protected Derived outerNotSynthetic() { + return outer != null && outer.b().synthetic() ? outer.outerNotSynthetic() : outer; + } + + @Override + public String toString() { + return toString(this); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + private String toString(Derived deepest) { + Derived ons = outerNotSynthetic(); + return (ons != null && !ons.isDerived(deepest.a(), deepest.b()) ? ons.toString(deepest) : "") + "[" + a() + "." + b() + "]"; + } + } } From 1a69fda3d6ffb6a868269ed8239b11e335dc309c Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 3 Apr 2024 12:47:27 +0200 Subject: [PATCH 040/179] nullpointer fix in derivation trace --- .../modelingvalue/dclare/AbstractDerivationTransaction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 971a55f7..250b9f2c 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -212,7 +212,11 @@ private T set(O object, Setable setable, T post, T nonDerived) { if (isTraceDerivation(object, observed)) { runSilent(() -> { Pair deriver = DERIVER.get(); - System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); + if (deriver != null) { + System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); + } else { + System.err.println(tracePre(object, this) + "SET (" + object + "." + observed + "=" + pre + "->" + result + ")"); + } }); } if (observed.containment()) { From fec87cc0a87d819d06a42c60c048904e023e9391 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 3 Apr 2024 13:02:23 +0200 Subject: [PATCH 041/179] do not trace synthetic --- .../org/modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 250b9f2c..0f495a2d 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -309,7 +309,7 @@ public ConstantState memoization() { @SuppressWarnings("rawtypes") protected boolean isTraceDerivation(O object, Setable setable) { - return (setable == null || !setable.isPlumbing()) && universeTransaction().getConfig().isTraceDerivation(); + return (setable == null || (!setable.isPlumbing() && !setable.synthetic())) && universeTransaction().getConfig().isTraceDerivation(); } private String tracePre(O object, Transaction transaction) { From 63521c146ca82d1d29b6f3eebbfb2968222756a6 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Thu, 4 Apr 2024 16:07:40 +0200 Subject: [PATCH 042/179] update gradle from 7.6 to 8.7 --- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 12 ++++++++---- gradlew.bat | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 36524 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%0DGK?7GHTj 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 VwlMN}`%er%aGR6olj~j${vQ;P=LY}) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702..20db9ad5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd4..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% From 2276fe0964ee9a4950158a9bd252dbf6f5cbfbfb Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Mon, 3 Jun 2024 22:54:41 +0200 Subject: [PATCH 043/179] minor refactoring of StateToJson --- .../org/modelingvalue/dclare/StateToJson.java | 91 +++++++++++-------- 1 file changed, 53 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index ba49fb7b..b9894234 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -20,26 +20,25 @@ package org.modelingvalue.dclare; -import java.util.AbstractMap.SimpleEntry; import java.util.Comparator; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; import java.util.Objects; import java.util.function.Predicate; -import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.List; import org.modelingvalue.collections.QualifiedSet; import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.util.Pair; import org.modelingvalue.dclare.sync.Util; import org.modelingvalue.json.ToJson; @SuppressWarnings({"rawtypes", "unused"}) public class StateToJson extends ToJson { - public static final String ID_FIELD_NAME = "@id"; - public static final String ID_REF_FIELD_NAME = "@idref"; - public static final String NAME_FIELD_NAME = "name"; + public static final String ID_FIELD_NAME = "@id"; + public static final String ID_REF_FIELD_NAME = "@idref"; + public static final String NAME_FIELD_NAME = "name"; private static final Comparator> FIELD_SORTER = ((Comparator>) (e1, e2) -> isNameOrId(e1) ? -1 : isNameOrId(e2) ? +1 : 0).thenComparing(e -> e.getKey().toString()); private static boolean isNameOrId(Entry e) { @@ -67,51 +66,68 @@ public String render() { return state.get(super::render); } - public boolean renderIdFor(Mutable mutable) { - return true; - } - @Override protected boolean isMapType(Object o) { - return o instanceof Mutable || o instanceof QualifiedSet; + return o instanceof Mutable || o instanceof QualifiedSet || o instanceof Map; } @SuppressWarnings("unchecked") @Override protected Iterator getArrayIterator(Object o) { - if (o instanceof Set) { - return (Iterator) ((Set) o).sorted(setSorter).asList().iterator(); + if (o instanceof Set) { + return (Iterator) ((Set) o).sorted(setSorter).asList().iterator(); } else { return super.getArrayIterator(o); } } - @SuppressWarnings("unchecked") @Override protected Iterator> getMapIterator(Object o) { - List> entries; + Map m; if (o instanceof Mutable mutable) { - Collection> stream = mutable.dClass().dSetables() // - .filter(getSetableFilter()) // - .map(setable -> Pair.of(setable, state.get(mutable, (Setable) setable))) // - .filter(pair -> !Objects.equals(pair.b(), ((Setable) pair.a()).getDefault(mutable))) // - .map(pair -> (Entry) new SimpleEntry<>((Object) renderTag(pair.a()), renderValue(o, pair.a(), pair.b()))) // - .sorted(FIELD_SORTER); - if (renderIdFor(mutable)) { - Collection> idEntry = Collection.of(new SimpleEntry<>(ID_FIELD_NAME, getId(mutable))); - stream = Collection.concat(idEntry, stream); - } - entries = stream.asList(); - } else if (o instanceof QualifiedSet) { - QualifiedSet q = (QualifiedSet) o; - entries = q.toKeys() // - .map(k -> (Entry) new SimpleEntry<>(k, q.get(k))) // - .sortedBy(e -> e.getKey().toString()) // - .asList(); + m = getMapIterator_Mutable(mutable); + } else if (o instanceof Map map) { + m = getMapIterator_Map(map); + } else if (o instanceof QualifiedSet qualifiedSet) { + m = getMapIterator_QualifiedSet(qualifiedSet); } else { throw new RuntimeException("this should not be reachable"); } - return entries.iterator(); + return m.entrySet().stream().sorted(FIELD_SORTER).iterator(); + } + + protected Map getMapIterator_Mutable(Mutable mutable) { + Predicate setableFilter = getSetableFilter(); + return mutable.dClass() + .dSetables() // + .map((Setable setable) -> { + if (!setableFilter.test(setable)) { + return null; + } + @SuppressWarnings("unchecked") + Object value = state.get(mutable, setable); + @SuppressWarnings("unchecked") + Object defValue = setable.getDefault(mutable); + if (Objects.equals(value, defValue)) { + return null; + } + return org.modelingvalue.collections.Entry.of((Object) renderTag(setable), renderValue(mutable, setable, value)); + }) // + .filter(Objects::nonNull) // + .asMap(e -> e) + .toMutable(); + } + + @SuppressWarnings("unchecked") + protected Map getMapIterator_QualifiedSet(QualifiedSet qualifiedSet) { + return qualifiedSet.toKeys() + .asMap(k -> org.modelingvalue.collections.Entry.of(k, qualifiedSet.get(k))) + .toMutable(); + } + + @SuppressWarnings("unchecked") + protected Map getMapIterator_Map(Map map) { + return map; } protected Predicate getSetableFilter() { @@ -150,10 +166,9 @@ protected Object renderReferenceValue(Object o, Setable setable, Object value) { return value; } - protected QualifiedSet makeRef(Mutable mutableValue) { - if (!renderIdFor(mutableValue)) { - throw new IllegalArgumentException("json serialisation can not proceed: need to " + ID_REF_FIELD_NAME + " to mutable " + getId(mutableValue) + " of class " + mutableValue.dClass() + " that does not render its " + ID_FIELD_NAME); - } - return QualifiedSet.of(__ -> ID_REF_FIELD_NAME, getId(mutableValue)); + protected Map makeRef(Mutable mutable) { + Map map = new HashMap<>(); + map.put(ID_REF_FIELD_NAME, getId(mutable)); + return map; } } From bc379a7039a01b7238c52844dafa5fd4eeb06899 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 13 Jun 2024 13:42:28 +0200 Subject: [PATCH 044/179] skip checks for NonCheckingObserver --- src/main/java/org/modelingvalue/dclare/LeafTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index b7f79e17..4bb97445 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -54,7 +54,7 @@ public static int sizeForConsistency(DefaultMap> map) { @SuppressWarnings("rawtypes") private static boolean ignoreForConsistency(Object o) { - return o instanceof Observed && !((Observed) o).checkConsistency(); + return (o instanceof Observed && !((Observed) o).checkConsistency()) || o instanceof NonCheckingObserver; } public static String condenseForConsistencyTrace(DefaultMap> map) { From af8c1f5bb1ba0b48b9eedaa7a6d08a82d0ed0aa6 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 25 Jun 2024 16:15:31 +0200 Subject: [PATCH 045/179] slightly simplified ripple-out --- .../org/modelingvalue/dclare/Mutable.java | 3 +- .../dclare/NonCheckingObserver.java | 5 + .../org/modelingvalue/dclare/Observer.java | 4 + .../dclare/ObserverTransaction.java | 107 +++++++----------- .../dclare/test/NewableTests.java | 2 +- 5 files changed, 49 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index f7d579af..096c0ed8 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -50,8 +50,7 @@ public interface Mutable extends TransactionClass { @SuppressWarnings({"rawtypes", "unchecked"}) Setable>> D_OBSERVERS = Setable.of("D_OBSERVERS", Set.of(), (tx, obj, pre, post) -> Setable.>, Observer> diff(pre, post, // added -> added.trigger(obj, added.fixpointGroup() == FixpointGroup.DEFAULT ? added.initPriority() : Priority.five), // - removed -> { - })); + removed -> removed.deObserve(tx, obj))); Observer D_OBSERVERS_RULE = NonCheckingObserver.of("D_OBSERVERS_RULE", m -> D_OBSERVERS.set(m, m.dAllObservers().exclude(o -> o.direction().isLazy()).asSet())); diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 2cf9a0d8..06f5b2cd 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -60,6 +60,11 @@ public NonCheckingObserver.NonCheckingTransaction newTransaction(UniverseTransac return new NonCheckingTransaction(universeTransaction); } + @Override + public boolean isActive(Mutable mutable) { + return !isStopped(); + } + public static class NonCheckingTransaction extends ObserverTransaction { protected NonCheckingTransaction(UniverseTransaction root) { diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index a745fe95..bee7fd0a 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -409,4 +409,8 @@ public Debugs debugs() { return debugs; } + public boolean isActive(Mutable mutable) { + return !isStopped() && Mutable.D_OBSERVERS.get(mutable).contains(this); + } + } diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index eab321cb..0e2be3a5 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -98,7 +98,7 @@ protected final void run(State pre, UniverseTransaction universeTransaction) { // check if the universe is still in the same transaction run, if not: reset the counts of my observer observer.startTransaction(universeTransaction.stats()); // check if we should do the work... - if (!observer.isStopped() && !universeTransaction.isKilled()) { + if (!universeTransaction.isKilled() && observer.isActive(mutable())) { observeds.init(Observed.OBSERVED_MAP); constructions.init(Map.of()); emptyMandatory.init(FALSE); @@ -159,10 +159,10 @@ private void finish(State pre, Observer observer) { } } trace(pre, observeds); - DefaultMap preSources = super.set(mutable, observer.observeds(), observeds); - if (preSources.isEmpty() && !observeds.isEmpty()) { + DefaultMap preObserveds = super.set(mutable, observer.observeds(), observeds); + if (preObserveds.isEmpty() && !observeds.isEmpty()) { observer.addInstance(); - } else if (!preSources.isEmpty() && observeds.isEmpty()) { + } else if (!preObserveds.isEmpty() && observeds.isEmpty()) { observer.removeInstance(); } } catch (ConsistencyError ce) { @@ -412,19 +412,17 @@ private Map actualize(Map map) { private T rippleOut(O object, Observed observed, T pre, T post) { boolean isColl = isNonMapCollection(pre) && isNonMapCollection(post); boolean isList = isColl && isList(pre) && isList(post); - boolean forward = isForward(object, observed, pre, post, isColl); - boolean isNew = !startState(Priority.four).get(mutable(), Mutable.D_OBSERVERS).contains(observer()); if (isColl) { ContainingCollection[] result = new ContainingCollection[]{(ContainingCollection) post}; Observed> many = (Observed>) observed; Setable. diff(pre, post, added -> { - Priority delay = added(object, many, added, forward, isNew); + Priority delay = added(object, many, added); if (delay != null) { defer.set(delay, TRUE); result[0] = result[0].remove(added); } }, removed -> { - Priority delay = removed(object, many, removed, forward, isNew); + Priority delay = removed(object, many, removed); if (delay != null) { defer.set(delay, TRUE); if (isList) { @@ -441,7 +439,7 @@ Setable. diff(pre, post, added -> { } } if (!isColl || isList) { - Priority delay = changed(object, observed, pre, post, forward, isNew); + Priority delay = changed(object, observed, pre, post); if (delay != null) { defer.set(delay, TRUE); traceRippleOut(object, observed, post, pre); @@ -459,72 +457,42 @@ private boolean isList(T t) { return t instanceof List; } - @SuppressWarnings({"rawtypes", "unchecked"}) - private boolean isForward(O outObject, Observed outObserved, T pre, T post, boolean isColl) { - Mutable mutable = mutable(); - Pair> intermediatePair = startState(Priority.INNER).get(mutable, Mutable.D_PARENT_CONTAINING); - if (!Objects.equals(preStartState(Priority.INNER).get(mutable, Mutable.D_PARENT_CONTAINING), intermediatePair) || !Objects.equals(intermediatePair, state().get(mutable, Mutable.D_PARENT_CONTAINING))) { - return true; - } else { - Boolean[] match = new Boolean[]{null}; - return observeds.get().anyMatch(e -> e.getValue().anyMatch(o -> { - Observed inObserved = e.getKey(); - if (!inObserved.isPlumbing()) { - Mutable inObject = o.dResolve(mutable); - if (!inObject.equals(outObject) || !inObserved.equals(outObserved)) { - Object intermediateObject = startState(Priority.INNER).get(inObject, inObserved); - return !Objects.equals(preStartState(Priority.INNER).get(inObject, inObserved), intermediateObject) || !Objects.equals(intermediateObject, state().get(inObject, inObserved)); - } else if (isColl) { - if (match[0] == null) { - match[0] = isChanged(outObject, outObserved, (ContainingCollection) pre, (ContainingCollection) post, preStartState(Priority.INNER), startState(Priority.INNER)) // - || isChanged(outObject, outObserved, (ContainingCollection) pre, (ContainingCollection) post, startState(Priority.INNER), state()); - } - return match[0]; - } - } - return false; - })); - } - } - - private boolean isChanged(O object, Observed many, ContainingCollection pre, ContainingCollection post, IState preState, IState postState) { - boolean[] result = new boolean[1]; - Setable. diff(preState.get(object, many), postState.get(object, many), added -> result[0] = pre.contains(added) == post.contains(added), removed -> result[0] = pre.contains(removed) == post.contains(removed)); - return result[0]; - } - - private , E> Priority added(O object, Observed observed, E added, boolean forward, boolean isNew) { - return added(object, observed, startState(Priority.INNER), state(), added, forward) ? Priority.INNER : // + private , E> Priority added(O object, Observed observed, E added) { + return added(object, observed, startState(Priority.INNER), state(), added) ? Priority.INNER : // becameDerived(observed, added, startState(Priority.three), current()) ? Priority.three : // - (isNew && added(object, observed, startState(), startState(Priority.four), added, forward)) ? Priority.four : // - added(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), added, forward) ? Priority.OUTER : null; + (isNew(startState(Priority.four), state()) && added(object, observed, startState(), startState(Priority.four), added)) ? Priority.four : // + added(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), added) ? Priority.OUTER : null; } - private , E> Priority removed(O object, Observed observed, E removed, boolean forward, boolean isNew) { - return removed(object, observed, startState(Priority.INNER), state(), removed, forward) ? Priority.INNER : // - (isNew && removed(object, observed, startState(), startState(Priority.four), removed, forward)) ? Priority.four : // + private , E> Priority removed(O object, Observed observed, E removed) { + return removed(object, observed, startState(Priority.INNER), state(), removed) ? Priority.INNER : // + (isNew(startState(Priority.four), state()) && removed(object, observed, startState(), startState(Priority.four), removed)) ? Priority.four : // becameContained(observed, removed, startState(Priority.four), startState(Priority.INNER)) ? Priority.four : // - removed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), removed, forward) ? Priority.OUTER : null; + removed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), removed) ? Priority.OUTER : null; } - private Priority changed(O object, Observed observed, T pre, T post, boolean forward, boolean isNew) { - return changed(object, observed, startState(Priority.INNER), state(), pre, post, forward) ? Priority.INNER : // + private Priority changed(O object, Observed observed, T pre, T post) { + return changed(object, observed, startState(Priority.INNER), state(), pre, post) ? Priority.INNER : // becameDerived(observed, post, startState(Priority.three), current()) ? Priority.three : // - (isNew && changed(object, observed, startState(), startState(Priority.four), pre, post, forward)) ? Priority.four : // + (isNew(startState(Priority.four), state()) && changed(object, observed, startState(), startState(Priority.four), pre, post)) ? Priority.four : // becameContained(observed, pre, startState(Priority.four), startState(Priority.INNER)) ? Priority.four : // - changed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), pre, post, forward) ? Priority.OUTER : null; + changed(object, observed, preStartState(Priority.OUTER).raw(), startState(Priority.OUTER), pre, post) ? Priority.OUTER : null; + } + + private boolean isNew(IState preState, IState postState) { + return !preState.get(mutable(), Mutable.D_OBSERVERS).contains(observer()) && postState.get(mutable(), Mutable.D_OBSERVERS).contains(observer()); } - private , E> boolean added(O object, Observed observed, IState preState, IState postState, E added, boolean forward) { - return isChildChanged(observed, added, preState, postState) || isRemoved(object, observed, added, preState, postState, forward); + private , E> boolean added(O object, Observed observed, IState preState, IState postState, E added) { + return isChildChanged(observed, added, preState, postState) || isRemoved(object, observed, added, preState, postState); } - private , E> boolean removed(O object, Observed observed, IState preState, IState postState, E removed, boolean forward) { - return isChildChanged(observed, removed, preState, postState) || isAdded(object, observed, removed, preState, postState, forward); + private , E> boolean removed(O object, Observed observed, IState preState, IState postState, E removed) { + return isChildChanged(observed, removed, preState, postState) || isAdded(object, observed, removed, preState, postState); } - private boolean changed(O object, Observed observed, IState preState, IState postState, T pre, T post, boolean forward) { - return isChangedBack(object, observed, pre, post, preState, postState, forward) || // + private boolean changed(O object, Observed observed, IState preState, IState postState, T pre, T post) { + return isChangedBack(object, observed, pre, post, preState, postState) || // isChildChanged(observed, pre, preState, postState) || isChildChanged(observed, post, preState, postState); } @@ -550,20 +518,21 @@ private boolean isChildChanged(Observed observed, E element, ISt return false; } - private , E> boolean isAdded(O object, Observed observed, E element, IState preState, IState postState, boolean forward) { - return !observed.collection(preState.get(object, observed)).contains(element) && // - (!forward || postState == state() || observed.collection(postState.get(object, observed)).contains(element)); + private , E> boolean isAdded(O object, Observed observed, E removed, IState preState, IState postState) { + return !observed.collection(preState.get(object, observed)).contains(removed) && // + (postState == state() || observed.collection(postState.get(object, observed)).contains(removed)); } - private , E> boolean isRemoved(O object, Observed observed, E element, IState preState, IState postState, boolean forward) { - return observed.collection(preState.get(object, observed)).contains(element) && // - (!forward || postState == state() || !observed.collection(postState.get(object, observed)).contains(element)); + private , E> boolean isRemoved(O object, Observed observed, E added, IState preState, IState postState) { + return observed.collection(preState.get(object, observed)).contains(added) && // + (postState == state() || !observed.collection(postState.get(object, observed)).contains(added)); } @SuppressWarnings("unused") - private boolean isChangedBack(O object, Observed observed, T pre, T post, IState preState, IState postState, boolean forward) { + private boolean isChangedBack(O object, Observed observed, T pre, T post, IState preState, IState postState) { T before = preState.get(object, observed); - return Objects.equals(before, post) && (!forward || (postState != state() && !Objects.equals(before, postState.get(object, observed)))); + return Objects.equals(before, post) && // + (postState == state() || !Objects.equals(before, postState.get(object, observed))); } private void traceRippleOut(O object, Feature feature, Object post, Object result) { diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index 5886bbe5..520f44b0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -431,7 +431,7 @@ private State oofb(DclareConfig config, boolean oo2fb, boolean fb2oo, boolean oo observe(right, ft -> mrol.get(rf), oo2fbDir). // observe(left, ft -> opp.get(rf) != null && compare(n.get(rf), n.get(opp.get(rf))) > 0 ? mrol.get(opp.get(rf)) : create(ROL, y -> y. // observe(n, rl -> "~", oo2fbDir). // - observe(otr, rl -> mobt.get((TestNewable) rf.dParent()), oo2fbDir) // + observe(otr, rl -> rf.dParent() != null ? mobt.get((TestNewable) rf.dParent()) : null, oo2fbDir) // ), oo2fbDir) // ) : null, oo2fbDir); } From 8c68c2718acde80abba91c5191d5d9e49dd9ff76 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 2 Jul 2024 12:20:11 +0200 Subject: [PATCH 046/179] defer removal of all freshly contained Mutables (not only Newables) --- .../org/modelingvalue/dclare/ObserverTransaction.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 0e2be3a5..d9efb32a 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -496,18 +496,16 @@ private boolean changed(O object, Observed observed, IState preStat isChildChanged(observed, pre, preState, postState) || isChildChanged(observed, post, preState, postState); } - @SuppressWarnings("unused") private boolean becameDerived(Observed observed, E element, IState preState, IState postState) { return element instanceof Newable && ((Newable) element).dInitialConstruction().isDerived() && // preState.get((Newable) element, Newable.D_ALL_DERIVATIONS).isEmpty() && // !postState.get((Newable) element, Newable.D_ALL_DERIVATIONS).isEmpty(); } - @SuppressWarnings("unused") private boolean becameContained(Observed observed, E element, IState preState, IState postState) { - return element instanceof Newable && // - preState.get((Newable) element, Mutable.D_PARENT_CONTAINING) == null && // - postState.get((Newable) element, Mutable.D_PARENT_CONTAINING) != null; + return element instanceof Mutable && // + preState.get((Mutable) element, Mutable.D_PARENT_CONTAINING) == null && // + postState.get((Mutable) element, Mutable.D_PARENT_CONTAINING) != null; } private boolean isChildChanged(Observed observed, E element, IState preState, IState postState) { @@ -528,7 +526,6 @@ private , E> boolean isRemoved(O object, Ob (postState == state() || !observed.collection(postState.get(object, observed)).contains(added)); } - @SuppressWarnings("unused") private boolean isChangedBack(O object, Observed observed, T pre, T post, IState preState, IState postState) { T before = preState.get(object, observed); return Objects.equals(before, post) && // From 88488711207526557925e09c656efc32ecd945c6 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 9 Jul 2024 11:57:47 +0200 Subject: [PATCH 047/179] derivation ripple out / merge --- .../modelingvalue/dclare/AbstractDerivationTransaction.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 0f495a2d..0ebf60e1 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -204,6 +204,9 @@ private T set(O object, Setable setable, T post, T nonDerived) { Constant constant = observed.constant(); T pre = isDerived && derived.isSet() ? derived.get() : mem.isSet(iLeafTransaction, object, constant) ? mem.get(iLeafTransaction, object, constant) : nonDerived; T result = match(mem, observed, pre, post); + if (isDerived && derived.isSet() && !Objects.equals(pre, nonDerived) && Objects.equals(result, nonDerived)) { + return post; + } if (isDerived) { derived.set(result); } else { From 7ec2b490ccaab310f66ee98553f46481197be6eb Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Sep 2024 12:20:34 +0200 Subject: [PATCH 048/179] NoCurrentTransactionException --- .../java/org/modelingvalue/dclare/Constant.java | 14 +++++++------- .../java/org/modelingvalue/dclare/Getable.java | 3 ++- .../java/org/modelingvalue/dclare/Observer.java | 2 +- .../dclare/ex/NoCurrentTransactionException.java | 12 ++++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 2e37c61b..5b658b88 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -88,7 +88,7 @@ public boolean isDurable() { @Override public T set(O object, BiFunction function, E element) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.set(leafTransaction, object, this, function, element); } @@ -98,38 +98,38 @@ public T set(O object, T value) { if (deriver != null) { throw new Error("Constant " + this + " is derived"); } - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.set(leafTransaction, object, this, value, false); } public T force(O object, T value) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.set(leafTransaction, object, this, value, true); } @Override public T get(O object) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.get(leafTransaction, object, this); } public O object(O object) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.object(leafTransaction, object); } public T get(O object, Function deriver) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.get(leafTransaction, object, this, deriver); } public boolean isSet(O object) { - LeafTransaction leafTransaction = LeafTransaction.getCurrent(); + LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); return constants.isSet(leafTransaction, object, this); } diff --git a/src/main/java/org/modelingvalue/dclare/Getable.java b/src/main/java/org/modelingvalue/dclare/Getable.java index 07a5055d..9aa4a622 100644 --- a/src/main/java/org/modelingvalue/dclare/Getable.java +++ b/src/main/java/org/modelingvalue/dclare/Getable.java @@ -28,6 +28,7 @@ import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Internable; import org.modelingvalue.collections.util.StringUtil; +import org.modelingvalue.dclare.ex.NoCurrentTransactionException; @SuppressWarnings("unused") public abstract class Getable implements Feature, Internable { @@ -93,7 +94,7 @@ public T pre(O object) { protected LeafTransaction currentLeaf(O object) { LeafTransaction current = LeafTransaction.getCurrent(); if (current == null) { - throw new NullPointerException("No current transaction in " + Thread.currentThread() + " , while accessing " + toString()); + throw new NoCurrentTransactionException(object, this, "No current transaction in " + Thread.currentThread()); } else if (object == null) { throw new NullPointerException("Object is null, while accessing " + current.state().get((this::toString))); } diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index bee7fd0a..916b8061 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -238,7 +238,7 @@ public Set checkConsistency(State state, Mutable object, List< for (ObserverTrace trace : post) { result = result.add(new DebugTrace(object, observer(), trace)); } - if (!LeafTransaction.getCurrent().universeTransaction().stats().debugging()) { + if (!currentLeaf(object).universeTransaction().stats().debugging()) { set(object, getDefault(object)); } } diff --git a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java new file mode 100644 index 00000000..ca9a5e9b --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java @@ -0,0 +1,12 @@ +package org.modelingvalue.dclare.ex; + +import org.modelingvalue.dclare.Feature; + +public class NoCurrentTransactionException extends ConsistencyError { + private static final long serialVersionUID = -2609383619673309143L; + + public NoCurrentTransactionException(Object object, Feature feature, String message) { + super(object, feature, 20, message); + } + +} From 95b6fed9f7bdfb48ca5ebed3c6ec8d39cdbfb9f0 Mon Sep 17 00:00:00 2001 From: automation Date: Fri, 6 Sep 2024 10:21:28 +0000 Subject: [PATCH 049/179] [no-ci] updated by mvgplugin --- .../ex/NoCurrentTransactionException.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java index ca9a5e9b..55304501 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare.ex; import org.modelingvalue.dclare.Feature; From 7bd095c778ca59e4a537ae5610907eae5888a52d Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 13 Sep 2024 14:44:26 +0200 Subject: [PATCH 050/179] immediate imperative transactions --- .../dclare/ImperativeTransaction.java | 34 +++++++++++---- .../dclare/MutableTransaction.java | 18 ++++++-- .../dclare/UniverseTransaction.java | 42 +++++++++++++++++-- .../dclare/sync/DeltaAdaptor.java | 2 +- .../dclare/test/support/TestUniverse.java | 2 +- 5 files changed, 80 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 4e0f8fe8..94c3b855 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -37,8 +37,8 @@ public class ImperativeTransaction extends LeafTransaction { protected static final DefaultMap> SETTED_MAP = DefaultMap.of(k -> Set.of()); @SuppressWarnings("rawtypes") - public static ImperativeTransaction of(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction) { - return new ImperativeTransaction(cls, init, universeTransaction, scheduler, diffHandler, keepTransaction); + public static ImperativeTransaction of(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction, boolean immediate) { + return new ImperativeTransaction(cls, init, universeTransaction, scheduler, diffHandler, keepTransaction, immediate); } private final static Setable CHANGE_NR = Setable.of("$CHANGE_NR", 0L); @@ -49,6 +49,7 @@ public static ImperativeTransaction of(Imperative cls, State init, UniverseTrans private final NamedIdentity actionId; private final Direction direction; private final MutableState state; + private final boolean immediate; private boolean active; private boolean commiting; @@ -58,8 +59,9 @@ public static ImperativeTransaction of(Imperative cls, State init, UniverseTrans private DefaultMap> allSetted; @SuppressWarnings("rawtypes") - protected ImperativeTransaction(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction) { + protected ImperativeTransaction(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction, boolean immediate) { super(universeTransaction); + this.immediate = immediate; this.state = universeTransaction.createMutableState(init); this.setted = SETTED_MAP; this.allSetted = SETTED_MAP; @@ -153,14 +155,24 @@ private void dclare2imper(State dclare, boolean timeTraveling, boolean insync) { diffHandler.handleDelta(imper, dclare, insync, finalAllSetted); } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings("rawtypes") private void imper2dclare() { State imper = state(); - DefaultMap> finalSetted = setted; + DefaultMap> changed = setted; setted = SETTED_MAP; - universeTransaction().put(Action.of(actionId, u -> { + Action action = changeAction(imper, changed); + if (immediate) { + universeTransaction().offer(action); + } else { + universeTransaction().put(action); + } + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + private Action changeAction(State imper, DefaultMap> changed) { + return Action.of(actionId, u -> { try { - finalSetted.forEachOrdered(e -> { + changed.forEachOrdered(e -> { DefaultMap props = imper.getProperties(e.getKey()); for (Setable p : e.getValue()) { if (p instanceof Queued && ((Queued) p).actions()) { @@ -177,7 +189,7 @@ private void imper2dclare() { CHANGE_NR.set(ImperativeTransaction.this, imper.get(ImperativeTransaction.this, CHANGE_NR)); universeTransaction().handleException(t); } - }, direction, LeafModifier.preserved)); + }, direction, LeafModifier.preserved); } @Override @@ -226,7 +238,11 @@ private void change(O object, Setable property, T preValue, T postV active = true; universeTransaction().addActive(this); } - universeTransaction().commit(); + if (immediate) { + schedule(this::imper2dclare); + } else { + universeTransaction().commit(); + } } } } diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index 6a07f87d..086b73ae 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -136,17 +136,17 @@ private void run(Set> actions, Set children) { } if (random.size() <= 2 || universeTransaction().getConfig().isRunSequential()) { runSequential(random); - if (!universeTransaction().isKilled() && (parent() == null || !hasQueued(state[0], parent().mutable(), one))) { - move(mutable(), one, zero); + if (!universeTransaction().isKilled() && !hasToGoUp()) { + moveOneToZero(); } } else { List begin = random.sublist(0, random.size() >> 1); runParallel(begin); if (!universeTransaction().isKilled()) { - if (parent() == null || !hasQueued(state[0], parent().mutable(), one)) { + if (!hasToGoUp()) { state[0] = state[0].set(mutable(), state[0].actions(zero), Set::addAll, actions.removeAll(begin)); state[0] = state[0].set(mutable(), state[0].children(zero), Set::addAll, children.removeAll(begin)); - move(mutable(), one, zero); + moveOneToZero(); } else { state[0] = state[0].set(mutable(), state[0].actions(one), Set::addAll, actions.removeAll(begin)); state[0] = state[0].set(mutable(), state[0].children(one), Set::addAll, children.removeAll(begin)); @@ -156,6 +156,16 @@ private void run(Set> actions, Set children) { } + private void moveOneToZero() { + if (parent() != null || !universeTransaction().poll(state)) { + move(mutable(), one, zero); + } + } + + private boolean hasToGoUp() { + return parent() != null && (hasQueued(state[0], parent().mutable(), one) || universeTransaction().hasImmediate()); + } + private void runParallel(List todo) { if (todo.size() > 1) { try { diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 24a81363..7eec772b 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -25,6 +25,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; @@ -69,9 +70,11 @@ public class UniverseTransaction extends MutableTransaction { private final Action clearOrphans = Action.of("$clearOrphans", this::clearOrphans); private final Action checkConsistency = Action.of("$checkConsistency", this::checkConsistency); private final Action deriveLazy = Action.of("$deriveLazy", this::deriveLazy); + private final Action poll = Action.of("$poll", this::poll); // private final boolean pull; protected final BlockingQueue> inQueue; + protected final ConcurrentLinkedQueue> immediateQueue; private final BlockingQueue resultQueue = new LinkedBlockingQueue<>(1); //TODO wire onto MoodManager private final State emptyState = createState(StateMap.EMPTY_STATE_MAP); private final State startState; @@ -182,6 +185,7 @@ public UniverseTransaction(Universe universe, ContextPool pool, boolean pull, Dc statusProvider = new StatusProvider<>(this, startStatus); this.config = Objects.requireNonNull(config); inQueue = new LinkedBlockingQueue<>(config.getMaxInInQueue()); + immediateQueue = new ConcurrentLinkedQueue<>(); universeStatistics = new UniverseStatistics(this); start(universe, null); preState = startState; @@ -283,7 +287,7 @@ public void run() { runActions(postActions); } commit(state, timeTraveling, imperativeTransactions.iterator()); - if (!killed && inQueue.isEmpty() && isStopped(state)) { + if (!killed && inQueue.isEmpty() && immediateQueue.isEmpty() && isStopped(state)) { break; } } catch (Throwable t) { @@ -490,7 +494,11 @@ private Priority hasQueued(State state) { } public int numInQueue() { - return inQueue.size(); + return inQueue.size() + immediateQueue.size(); + } + + protected boolean hasImmediate() { + return !immediateQueue.isEmpty(); } public boolean isHandling() { //TODO wire onto MoodManager @@ -652,6 +660,13 @@ public void put(Action action) { } } + public void offer(Action action) { + if (!killed) { + immediateQueue.offer(action); + put(poll); + } + } + private Action take() { try { return inQueue.take(); @@ -660,6 +675,23 @@ private Action take() { } } + protected boolean poll(State[] state) { + Action action = immediateQueue.poll(); + if (action != null) { + state[0] = state[0].set(universe(), state[0].actions(Priority.zero), Set::add, action); + return true; + } else { + return false; + } + } + + protected void poll(Universe universe) { + Action action = immediateQueue.poll(); + if (action != null) { + action.trigger(universe); + } + } + protected void end(State state) { //TODO wire onto MoodManager try { resultQueue.put(state); @@ -707,7 +739,11 @@ public void addPostAction(Action action) { } public ImperativeTransaction addImperative(String id, StateDeltaHandler diffHandler, Consumer scheduler, boolean keepTransaction) { - ImperativeTransaction n = ImperativeTransaction.of(Imperative.of(id), preState, this, scheduler, diffHandler, keepTransaction); + return addImperative(id, diffHandler, scheduler, keepTransaction, false); + } + + public ImperativeTransaction addImperative(String id, StateDeltaHandler diffHandler, Consumer scheduler, boolean keepTransaction, boolean immediate) { + ImperativeTransaction n = ImperativeTransaction.of(Imperative.of(id), preState, this, scheduler, diffHandler, keepTransaction, immediate); synchronized (this) { imperativeTransactions = imperativeTransactions.add(n); } diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index 5c023de8..34c95af8 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -56,7 +56,7 @@ public DeltaAdaptor(String name, UniverseTransaction tx, SerializationHelper Date: Fri, 13 Sep 2024 15:16:39 +0200 Subject: [PATCH 051/179] improve immediate --- .../dclare/ImperativeTransaction.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 94c3b855..b80501f2 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -125,7 +125,7 @@ public final boolean commit(State dclare, boolean timeTraveling) { } if (!setted.isEmpty()) { insync = false; - imper2dclare(); + universeTransaction().put(imper2dclare()); } else if (insync && active) { active = false; universeTransaction().removeActive(this); @@ -155,17 +155,16 @@ private void dclare2imper(State dclare, boolean timeTraveling, boolean insync) { diffHandler.handleDelta(imper, dclare, insync, finalAllSetted); } + private void immediate() { + universeTransaction().offer(imper2dclare()); + } + @SuppressWarnings("rawtypes") - private void imper2dclare() { + private Action imper2dclare() { State imper = state(); DefaultMap> changed = setted; setted = SETTED_MAP; - Action action = changeAction(imper, changed); - if (immediate) { - universeTransaction().offer(action); - } else { - universeTransaction().put(action); - } + return changeAction(imper, changed); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -239,7 +238,7 @@ private void change(O object, Setable property, T preValue, T postV universeTransaction().addActive(this); } if (immediate) { - schedule(this::imper2dclare); + schedule(this::immediate); } else { universeTransaction().commit(); } From 941fa4c50849c457031ebca6f10f78a1206b5993 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 13 Sep 2024 15:19:09 +0200 Subject: [PATCH 052/179] optimization --- .../java/org/modelingvalue/dclare/ImperativeTransaction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index b80501f2..779dec76 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -156,7 +156,9 @@ private void dclare2imper(State dclare, boolean timeTraveling, boolean insync) { } private void immediate() { - universeTransaction().offer(imper2dclare()); + if (!setted.isEmpty()) { + universeTransaction().offer(imper2dclare()); + } } @SuppressWarnings("rawtypes") From c032648430633649f160c79e61b620d65136bf39 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 14 Sep 2024 09:28:44 +0200 Subject: [PATCH 053/179] modifiers for imperatives --- .../java/org/modelingvalue/dclare/Action.java | 6 ++-- .../dclare/CoreLeafModifier.java | 30 +++++++++++++++++++ .../org/modelingvalue/dclare/Imperative.java | 13 ++++++++ .../dclare/ImperativeTransaction.java | 14 ++++----- .../modelingvalue/dclare/LeafModifier.java | 29 ------------------ .../org/modelingvalue/dclare/Observer.java | 4 +-- .../dclare/UniverseTransaction.java | 8 ++--- .../dclare/sync/DeltaAdaptor.java | 2 +- .../dclare/test/support/TestNewable.java | 8 ++--- .../dclare/test/support/TestUniverse.java | 2 +- 10 files changed, 62 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index 3732d3ff..c19f2e12 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -37,15 +37,15 @@ public static Action of(Object id, Consumer action, Le private final Direction direction; private final boolean preserved; private final boolean read; - private long durationNano = -1; + private long durationNano = -1; protected Action(Object id, Consumer action, LeafModifier... modifiers) { super(id, modifiers); this.action = action; Direction dir = getModifier(Direction.class); this.direction = dir == null ? Direction.DEFAULT : dir; - this.preserved = hasModifier(LeafModifier.preserved); - this.read = hasModifier(LeafModifier.read); + this.preserved = hasModifier(CoreLeafModifier.preserved); + this.read = hasModifier(CoreLeafModifier.read); } @Override diff --git a/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java new file mode 100644 index 00000000..f5f65e53 --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java @@ -0,0 +1,30 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +package org.modelingvalue.dclare; + +public enum CoreLeafModifier implements LeafModifier> { + anonymous, + preserved, + atomic, + read, + immediate, + keep; +} diff --git a/src/main/java/org/modelingvalue/dclare/Imperative.java b/src/main/java/org/modelingvalue/dclare/Imperative.java index 6c41732e..34bd3c3b 100644 --- a/src/main/java/org/modelingvalue/dclare/Imperative.java +++ b/src/main/java/org/modelingvalue/dclare/Imperative.java @@ -26,8 +26,13 @@ public static Imperative of(String id, LeafModifier... modifiers) { return new Imperative(id, modifiers); } + private final boolean immediate; + private final boolean keep; + protected Imperative(String id, LeafModifier... modifiers) { super(id, modifiers); + this.immediate = hasModifier(CoreLeafModifier.immediate); + this.keep = hasModifier(CoreLeafModifier.keep); } @Override @@ -50,4 +55,12 @@ public ImperativeTransaction newTransaction(UniverseTransaction universeTransact throw new UnsupportedOperationException(); } + public boolean immediate() { + return immediate; + } + + public boolean keep() { + return keep; + } + } diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 779dec76..ad17dc39 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -37,8 +37,8 @@ public class ImperativeTransaction extends LeafTransaction { protected static final DefaultMap> SETTED_MAP = DefaultMap.of(k -> Set.of()); @SuppressWarnings("rawtypes") - public static ImperativeTransaction of(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction, boolean immediate) { - return new ImperativeTransaction(cls, init, universeTransaction, scheduler, diffHandler, keepTransaction, immediate); + public static ImperativeTransaction of(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler) { + return new ImperativeTransaction(cls, init, universeTransaction, scheduler, diffHandler); } private final static Setable CHANGE_NR = Setable.of("$CHANGE_NR", 0L); @@ -49,7 +49,6 @@ public static ImperativeTransaction of(Imperative cls, State init, UniverseTrans private final NamedIdentity actionId; private final Direction direction; private final MutableState state; - private final boolean immediate; private boolean active; private boolean commiting; @@ -59,9 +58,8 @@ public static ImperativeTransaction of(Imperative cls, State init, UniverseTrans private DefaultMap> allSetted; @SuppressWarnings("rawtypes") - protected ImperativeTransaction(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler, boolean keepTransaction, boolean immediate) { + protected ImperativeTransaction(Imperative cls, State init, UniverseTransaction universeTransaction, Consumer scheduler, StateDeltaHandler diffHandler) { super(universeTransaction); - this.immediate = immediate; this.state = universeTransaction.createMutableState(init); this.setted = SETTED_MAP; this.allSetted = SETTED_MAP; @@ -69,7 +67,7 @@ protected ImperativeTransaction(Imperative cls, State init, UniverseTransaction this.direction = Direction.of(cls.id()); this.actionId = NamedIdentity.of(this, cls.id().toString()); super.start(cls, universeTransaction); - this.scheduler = keepTransaction ? r -> scheduler.accept(() -> { + this.scheduler = cls.keep() ? r -> scheduler.accept(() -> { if (isOpen()) { LeafTransaction.getContext().setOnThread(this); try { @@ -190,7 +188,7 @@ private Action changeAction(State imper, DefaultMap void change(O object, Setable property, T preValue, T postV active = true; universeTransaction().addActive(this); } - if (immediate) { + if (imperative().immediate()) { schedule(this::immediate); } else { universeTransaction().commit(); diff --git a/src/main/java/org/modelingvalue/dclare/LeafModifier.java b/src/main/java/org/modelingvalue/dclare/LeafModifier.java index 9b6f1e6e..64ee7e13 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/LeafModifier.java @@ -21,33 +21,4 @@ package org.modelingvalue.dclare; public interface LeafModifier> extends FeatureModifier { - - static LeafModifier> anonymous = new LeafModifier<>() { - @Override - public String toString() { - return "anonymous"; - } - }; - - static LeafModifier> preserved = new LeafModifier<>() { - @Override - public String toString() { - return "preserved"; - } - }; - - static LeafModifier> atomic = new LeafModifier<>() { - @Override - public String toString() { - return "atomic"; - } - }; - - static LeafModifier> read = new LeafModifier<>() { - @Override - public String toString() { - return "read"; - } - }; - } diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index 916b8061..a1dee466 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -126,8 +126,8 @@ protected Observer(Object id, Consumer action, Set> targets, Le exception = ExceptionSetable.of(this); constructed = Constructed.of(this); this.targets = targets; - this.anonymous = hasModifier(LeafModifier.anonymous); - this.atomic = hasModifier(LeafModifier.atomic); + this.anonymous = hasModifier(CoreLeafModifier.anonymous); + this.atomic = hasModifier(CoreLeafModifier.atomic); } public Observerds observeds() { diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 7eec772b..75de340a 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -738,12 +738,8 @@ public void addPostAction(Action action) { } } - public ImperativeTransaction addImperative(String id, StateDeltaHandler diffHandler, Consumer scheduler, boolean keepTransaction) { - return addImperative(id, diffHandler, scheduler, keepTransaction, false); - } - - public ImperativeTransaction addImperative(String id, StateDeltaHandler diffHandler, Consumer scheduler, boolean keepTransaction, boolean immediate) { - ImperativeTransaction n = ImperativeTransaction.of(Imperative.of(id), preState, this, scheduler, diffHandler, keepTransaction, immediate); + public ImperativeTransaction addImperative(String id, StateDeltaHandler diffHandler, Consumer scheduler, LeafModifier... modifiers) { + ImperativeTransaction n = ImperativeTransaction.of(Imperative.of(id, modifiers), preState, this, scheduler, diffHandler); synchronized (this) { imperativeTransactions = imperativeTransactions.add(n); } diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index 34c95af8..e6a0d18d 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -56,7 +56,7 @@ public DeltaAdaptor(String name, UniverseTransaction tx, SerializationHelper action, LeafModifier... modifiers) { - return super.observe(this::isActive, action, FeatureModifier.add(modifiers, direction(), LeafModifier.anonymous)); + return super.observe(this::isActive, action, FeatureModifier.add(modifiers, direction(), CoreLeafModifier.anonymous)); } @Override @SuppressWarnings("unchecked") public final TestNewableClass observe(Setable setable, SerializableFunction value, LeafModifier... modifiers) { - return super.observe(this::isActive, setable, value, FeatureModifier.add(modifiers, direction(), LeafModifier.anonymous)); + return super.observe(this::isActive, setable, value, FeatureModifier.add(modifiers, direction(), CoreLeafModifier.anonymous)); } @Override @SuppressWarnings("unchecked") public TestNewableClass observe(SerializablePredicate predicate, SerializableConsumer action, LeafModifier... modifiers) { SerializablePredicate a = this::isActive; - return (TestNewableClass) super.observe((t) -> a.test(t) && predicate.test(t), action, FeatureModifier.add(modifiers, direction(), LeafModifier.anonymous)); + return (TestNewableClass) super.observe((t) -> a.test(t) && predicate.test(t), action, FeatureModifier.add(modifiers, direction(), CoreLeafModifier.anonymous)); } @Override @SuppressWarnings("unchecked") public TestNewableClass observe(SerializablePredicate predicate, Setable setable, SerializableFunction value, LeafModifier... modifiers) { SerializablePredicate a = this::isActive; - return (TestNewableClass) super.observe((t) -> a.test(t) && predicate.test(t), setable, value, FeatureModifier.add(modifiers, direction(), LeafModifier.anonymous)); + return (TestNewableClass) super.observe((t) -> a.test(t) && predicate.test(t), setable, value, FeatureModifier.add(modifiers, direction(), CoreLeafModifier.anonymous)); } private boolean isActive(TestMutable object) { diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java index 636aeddb..d61d8f36 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java @@ -63,7 +63,7 @@ public void init() { } } }); - }, scheduler, false, false); + }, scheduler); } @Override From 747591f5236b97dab19991d6767c1d7ff2500fd7 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 16 Sep 2024 13:29:40 +0200 Subject: [PATCH 054/179] dHasParentCycle utility method --- src/main/java/org/modelingvalue/dclare/Mutable.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 096c0ed8..ea1115d7 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -271,4 +271,15 @@ private ParentContaining(Object id, SetableModifier... modifiers) { } } + default boolean dHasParentCycle(State state) { + List ancestors = List.of(this); + for (Mutable parent = state.getA(this, D_PARENT_CONTAINING); parent != null; parent = state.getA(parent, D_PARENT_CONTAINING)) { + if (ancestors.contains(parent)) { + return true; + } + ancestors = ancestors.add(parent); + } + return false; + } + } From 50cc205151694dbc4a41af6b09674db2a2aa05e9 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 23 Sep 2024 18:37:30 +0200 Subject: [PATCH 055/179] removed QualifiedDefaultSet --- .../dclare/test/CommunicationTests.java | 14 +++++---- .../test/support/CommunicationPeer.java | 2 +- .../dclare/test/support/ModelMaker.java | 30 ++++++------------- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java index 6615d359..209b68b3 100644 --- a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java @@ -27,9 +27,15 @@ import java.io.IOException; import java.util.ConcurrentModificationException; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.modelingvalue.collections.util.TraceTimer; -import org.modelingvalue.dclare.test.support.*; +import org.modelingvalue.dclare.test.support.CommunicationHelper; +import org.modelingvalue.dclare.test.support.CommunicationPeer; +import org.modelingvalue.dclare.test.support.ModelMaker; +import org.modelingvalue.dclare.test.support.PeerTester; +import org.modelingvalue.dclare.test.support.TestDeltaAdaptor; public class CommunicationTests { static { @@ -82,8 +88,6 @@ public void universeSyncWithinOneJVM() { assertEquals(NEW_VALUE, b.getXyzzy_aDefMap().size()); assertEquals(NEW_VALUE, a.getXyzzy_aQuaSet().size()); assertEquals(NEW_VALUE, b.getXyzzy_aQuaSet().size()); - assertEquals(NEW_VALUE, a.getXyzzy_aQuaDefSet().size()); - assertEquals(NEW_VALUE, b.getXyzzy_aQuaDefSet().size()); assertEquals("~1", a.getXyzzy_aList().get(1)); assertEquals("~1", b.getXyzzy_aList().get(1)); @@ -95,8 +99,6 @@ public void universeSyncWithinOneJVM() { assertEquals("1!dm!v!", b.getXyzzy_aDefMap().get("1!dm!k!")); assertEquals("QS1", a.getXyzzy_aQuaSet().get("QS1")); assertEquals("QS1", b.getXyzzy_aQuaSet().get("QS1")); - assertEquals("QDS1", a.getXyzzy_aQuaDefSet().get("QDS1")); - assertEquals("QDS1", b.getXyzzy_aQuaDefSet().get("QDS1")); } busyWaitAllForIdle(); } diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java index a2bd6aff..af963b01 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java @@ -60,7 +60,7 @@ protected void execute(String delta) { // delta robot->main AtomicBoolean stop = new AtomicBoolean(); CommunicationHelper.interpreter(System.in, stop, Map.of(Entry.of('.', (c, line) -> System.out.println("." + line)), Entry.of('D', (c, line) -> mmSlaveAdaptor.accept(line)), // delta main->robot - Entry.of('C', (c, line) -> check(line, mmSlave.getXyzzy_source(), mmSlave.getXyzzy_target(), mmSlave.getXyzzy_aList().size(), mmSlave.getXyzzy_aSet().size() / 2, mmSlave.getXyzzy_aMap().size(), mmSlave.getXyzzy_aDefMap().size(), mmSlave.getXyzzy_aQuaSet().size(), mmSlave.getXyzzy_aQuaDefSet().size())), Entry.of('Q', (c, line) -> stop.set(true)), Entry.of('*', (c, line) -> exit(10, "ERROR: unknown command " + c + line)))); + Entry.of('C', (c, line) -> check(line, mmSlave.getXyzzy_source(), mmSlave.getXyzzy_target(), mmSlave.getXyzzy_aList().size(), mmSlave.getXyzzy_aSet().size() / 2, mmSlave.getXyzzy_aMap().size(), mmSlave.getXyzzy_aDefMap().size(), mmSlave.getXyzzy_aQuaSet().size())), Entry.of('Q', (c, line) -> stop.set(true)), Entry.of('*', (c, line) -> exit(10, "ERROR: unknown command " + c + line)))); CommunicationHelper.tearDownAll(); System.err.println("peer stopped"); diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index ce613f90..3cbb5f2d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -20,17 +20,23 @@ package org.modelingvalue.dclare.test.support; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.fail; +import static org.modelingvalue.collections.util.TraceTimer.traceLog; +import static org.modelingvalue.dclare.CoreSetableModifier.containment; + +import java.util.function.Predicate; + import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.DefaultMap; import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; -import org.modelingvalue.collections.QualifiedDefaultSet; import org.modelingvalue.collections.QualifiedSet; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Concurrent; -import org.modelingvalue.collections.util.ContextThread; import org.modelingvalue.collections.util.ContextPool; +import org.modelingvalue.collections.util.ContextThread; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.dclare.Constant; import org.modelingvalue.dclare.DclareConfig; @@ -41,13 +47,6 @@ import org.modelingvalue.dclare.sync.SerializationHelper; import org.modelingvalue.dclare.sync.Util; -import java.util.function.Predicate; - -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.fail; -import static org.modelingvalue.collections.util.TraceTimer.traceLog; -import static org.modelingvalue.dclare.CoreSetableModifier.containment; - @SuppressWarnings({"FieldCanBeLocal", "unchecked", "rawtypes"}) public class ModelMaker { // TODO: need to fix the bug and remove this workaround: @@ -68,7 +67,6 @@ public class ModelMaker { private static final Observed> aMap = TestObserved.of("#aMap", ModelMaker::id, ModelMaker::desMap, Map.of()); private static final Observed> aDefMap = TestObserved.of("#aDefMap", ModelMaker::id, ModelMaker::desDefMap, DefaultMap.of(k -> "zut")); private static final Observed> aQuaSet = TestObserved.of("#aQuaSet", ModelMaker::id, ModelMaker::desQuaSet, QualifiedSet.of(v -> v)); - private static final Observed> aQuaDefSet = TestObserved.of("#aQuaDefSet", ModelMaker::id, ModelMaker::desQuaDefSet, QualifiedDefaultSet.of(v -> v, k -> "zutje")); public static final SerializationHelper> SERIALIZATION_HELPER = new SerializationHelper<>() { //////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -183,11 +181,6 @@ private static QualifiedSet desQuaSet(TestMutable mutable, TestO return obs.getDefault(mutable).addAll(oo); } - private static QualifiedDefaultSet desQuaDefSet(TestMutable mutable, TestObserved> obs, Object o) { - List oo = (List) o; - return obs.getDefault(mutable).addAll(oo); - } - private static final TestMutableClass extraClass = TestMutableClass.of("ExtraClass"); private static final TestMutableClass plughClassMain = TestMutableClass.of("PlughClass").observe( // o -> target.set(o, source.get(o))).observe( // @@ -204,8 +197,7 @@ private static QualifiedDefaultSet desQuaDefSet(TestMutable muta o -> aSet.set(o, Collection.range(0, source.get(o)).flatMap(i -> Collection.of("&" + i, "@" + i * 2)).asSet())).observe( // o -> aMap.set(o, Collection.range(0, source.get(o)).asMap(i -> Entry.of(i + "!m!k!", i + "!m!v!")))).observe( // o -> aDefMap.set(o, aDefMap.getDefault(o).addAll(Collection.range(0, source.get(o)).map(i -> Entry.of(i + "!dm!k!", i + "!dm!v!"))))).observe( // - o -> aQuaSet.set(o, aQuaSet.getDefault(o).addAll(Collection.range(0, source.get(o)).map(i -> "QS" + i)))).observe( // - o -> aQuaDefSet.set(o, aQuaDefSet.getDefault(o).addAll(Collection.range(0, source.get(o)).map(i -> "QDS" + i)))); + o -> aQuaSet.set(o, aQuaSet.getDefault(o).addAll(Collection.range(0, source.get(o)).map(i -> "QS" + i)))); private final String name; private final TestMutable xyzzy; private final Constant plugConst; @@ -296,10 +288,6 @@ public QualifiedSet getXyzzy_aQuaSet() { return tx.currentState().get(xyzzy, aQuaSet); } - public QualifiedDefaultSet getXyzzy_aQuaDefSet() { - return tx.currentState().get(xyzzy, aQuaDefSet); - } - public TestMutable getXyzzy_extra() { return tx.currentState().get(xyzzy, extra); } From dab4b359d22513c57fc7b4dcc5a6e76a2c0b4fb4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 5 Nov 2024 09:35:16 +0100 Subject: [PATCH 056/179] try prune only --- src/main/java/org/modelingvalue/dclare/ConstantState.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 5f888f4d..daee74c8 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -377,7 +377,11 @@ private QualifiedSet pruneEqualHashes(O object, Qualified } } } - allWithEqualhash = prev.allWithEqualhash(object); + if (i == 0) { + break; + } else { + allWithEqualhash = prev.allWithEqualhash(object); + } } return prev; } From cfd80f891979271eba27527766f58f751b70ed83 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 7 Nov 2024 14:05:15 +0100 Subject: [PATCH 057/179] restrict matching single containments --- src/main/java/org/modelingvalue/dclare/ObserverTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index d9efb32a..6a10fb2c 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -557,7 +557,7 @@ private Object singleMatch(Mutable object, Observed observed, Object before, Obj before = postInfo.newable(); } else if (observed.containment()) { boolean found = false; - for (Observed cont : MutableClass.D_CONTAINMENTS.get(object.dClass()).filter(Observed.class).exclude(observed::equals)) { + for (Observed cont : MutableClass.D_CONTAINMENTS.get(object.dClass()).filter(Observed.class).filter(o -> o.getClass().equals(observed.getClass())).exclude(observed::equals)) { Object val = cont.current(object); if (val instanceof Newable && ((Newable) after).dNewableType().equals(((Newable) val).dNewableType())) { if (after.equals(val)) { From 53b921f42a148598fca0169d3496520c3a73278f Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 14 Nov 2024 09:00:51 +0100 Subject: [PATCH 058/179] Logic --- .../java/org/modelingvalue/dclare/Logic.java | 419 ++++++++++++++++++ .../org/modelingvalue/dclare/Universe.java | 31 ++ .../modelingvalue/dclare/test/LogicTest.java | 53 +++ 3 files changed, 503 insertions(+) create mode 100644 src/main/java/org/modelingvalue/dclare/Logic.java create mode 100644 src/test/java/org/modelingvalue/dclare/test/LogicTest.java diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java new file mode 100644 index 00000000..2c6cba41 --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -0,0 +1,419 @@ +package org.modelingvalue.dclare; + +import java.util.function.BiPredicate; +import java.util.function.BooleanSupplier; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.List; +import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.util.Context; +import org.modelingvalue.collections.util.Pair; +import org.modelingvalue.collections.util.Single; +import org.modelingvalue.collections.util.TriPredicate; +import org.modelingvalue.collections.util.Triple; +import org.modelingvalue.dclare.ex.NonDeterministicException; + +public final class Logic { + private Logic() { + } + + private static final Context> VARIABLES = Context.of(List.of()); + + public static abstract class ClauseType { + }; + + // Functions + + public static final Fun1 fun1(Object id, java.util.function.Function> f) { + return new Fun1(id, (o) -> f.apply(o).get()); + } + + public static final Fun1 fun1(Object id) { + return new Fun1(id, (o) -> null); + } + + public static final Fun2 fun2(Object id, java.util.function.BiFunction> f) { + return new Fun2(id, (o1, o2) -> f.apply(o1, o2).get()); + } + + public static final Fun2 fun2(Object id) { + return new Fun2(id, (o1, o2) -> null); + } + + public static final Fun3 function(Object id, org.modelingvalue.collections.util.TriFunction> f) { + return new Fun3(id, (o1, o2, o3) -> f.apply(o1, o2, o3).get()); + } + + public static final Fun3 function(Object id) { + return new Fun3(id, (o1, o2, o3) -> null); + } + + public static final class Fun1 extends ClauseType { + private final Constant, T> constant; + private final Setable, Set>> extend; + + private Fun1(Object id, java.util.function.Function f) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., T> of(id, o -> f.apply(o.a()), (tx, o, b, t) -> { + if (t != null) { + extend.add(Single.of(null), o); + } + }); + } + + public Supplier sup(O o) { + return () -> get(o); + } + + public T get(O o) { + return constant.get(Single.of(o)); + } + + public void set(O o, T t) { + constant.force(Single.of(o), t); + } + + @Override + public String toString() { + return constant.toString(); + } + } + + public static final class Fun2 extends ClauseType { + private final Constant, T> constant; + private final Setable, Set>> extend; + + private Fun2(Object id, java.util.function.BiFunction f) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., T> of(id, o -> f.apply(o.a(), o.b()), (tx, o, b, t) -> { + if (t != null) { + extend.add(Pair.of(null, null), o); + extend.add(Pair.of(o.a(), null), o); + extend.add(Pair.of(null, o.b()), o); + } + }); + } + + public Supplier sup(O1 o1, O2 o2) { + return () -> get(o1, o2); + } + + public T get(O1 o1, O2 o2) { + return constant.get(Pair.of(o1, o2)); + } + + public void set(O1 o1, O2 o2, T t) { + constant.force(Pair.of(o1, o2), t); + } + + @Override + public String toString() { + return constant.toString(); + } + } + + public static final class Fun3 extends ClauseType { + private final Constant, T> constant; + private final Setable, Set>> extend; + + private Fun3(Object id, org.modelingvalue.collections.util.TriFunction f) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., T> of(id, o -> f.apply(o.a(), o.b(), o.c()), (tx, o, b, t) -> { + if (t != null) { + extend.add(Triple.of(null, null, null), o); + extend.add(Triple.of(o.a(), null, null), o); + extend.add(Triple.of(null, o.b(), null), o); + extend.add(Triple.of(null, null, o.c()), o); + extend.add(Triple.of(o.a(), o.b(), null), o); + extend.add(Triple.of(o.a(), null, o.c()), o); + extend.add(Triple.of(null, o.b(), o.c()), o); + } + }); + } + + public Supplier sup(O1 o1, O2 o2, O3 o3) { + return () -> get(o1, o2, o3); + } + + public T get(O1 o1, O2 o2, O3 o3) { + return constant.get(Triple.of(o1, o2, o3)); + } + + public void set(O1 o1, O2 o2, O3 o3, T t) { + constant.force(Triple.of(o1, o2, o3), t); + } + + @Override + public String toString() { + return constant.toString(); + } + + } + + // Relations + + public static final Rel1 rel1(Object id, java.util.function.Function p) { + return new Rel1(id, (o) -> p.apply(o).getAsBoolean()); + } + + public static final Rel1 rel1(Object id) { + return new Rel1(id, (o) -> false); + } + + public static final Rel2 rel2(Object id, java.util.function.BiFunction p) { + return new Rel2(id, (o1, o2) -> p.apply(o1, o2).getAsBoolean()); + } + + public static final Rel2 rel2(Object id) { + return new Rel2(id, (o1, o2) -> false); + } + + public static final Rel3 rel3(Object id, org.modelingvalue.collections.util.TriFunction p) { + return new Rel3(id, (o1, o2, o3) -> p.apply(o1, o2, o3).getAsBoolean()); + } + + public static final Rel3 rel3(Object id) { + return new Rel3(id, (o1, o2, o3) -> false); + } + + public static final class Rel1 extends ClauseType { + private final Constant, Boolean> constant; + private final Setable, Set>> extend; + + private Rel1(Object id, Predicate p) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., Boolean> of(id, o -> p.test(o.a()), (tx, o, b, t) -> { + if (t != null) { + extend.add(Single.of(null), o); + } + }); + } + + @SuppressWarnings("unchecked") + public BooleanSupplier sup(O o) { + return () -> is(o); + } + + public boolean is(O o) { + return constant.get(Single.of(o)); + } + + public void set(O o) { + constant.force(Single.of(o), true); + } + + @Override + public String toString() { + return constant.toString(); + } + + } + + public static final class Rel2 extends ClauseType { + private final Constant, Boolean> constant; + private final Setable, Set>> extend; + + private Rel2(Object id, BiPredicate p) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., Boolean> of(id, o -> p.test(o.a(), o.b()), (tx, o, b, t) -> { + if (t) { + extend.add(Pair.of(null, null), o); + extend.add(Pair.of(o.a(), null), o); + extend.add(Pair.of(null, o.b()), o); + } + }); + } + + @SuppressWarnings("unchecked") + public BooleanSupplier sup(O1 o1, O2 o2) { + return () -> is(o1, o2); + } + + public boolean is(O1 o1, O2 o2) { + return constant.get(Pair.of(o1, o2)); + } + + public void set(O1 o1, O2 o2) { + constant.force(Pair.of(o1, o2), true); + } + + @Override + public String toString() { + return constant.toString(); + } + } + + public static final class Rel3 extends ClauseType { + private final Constant, Boolean> constant; + private final Setable, Set>> extend; + + private Rel3(Object id, TriPredicate p) { + extend = Setable., Set>> of(Single.of(id), Set.of()); + constant = Constant., Boolean> of(id, o -> p.test(o.a(), o.b(), o.c()), (tx, o, b, t) -> { + if (t) { + extend.add(Triple.of(null, null, null), o); + extend.add(Triple.of(o.a(), null, null), o); + extend.add(Triple.of(null, o.b(), null), o); + extend.add(Triple.of(null, null, o.c()), o); + extend.add(Triple.of(o.a(), o.b(), null), o); + extend.add(Triple.of(o.a(), null, o.c()), o); + extend.add(Triple.of(null, o.b(), o.c()), o); + } + }); + } + + @SuppressWarnings("unchecked") + public BooleanSupplier sup(O1 o1, O2 o2, O3 o3) { + return () -> is(o1, o2, o3); + } + + public boolean is(O1 o1, O2 o2, O3 o3) { + return constant.get(Triple.of(o1, o2, o3)); + } + + public void set(O1 o1, O2 o2, O3 o3) { + constant.force(Triple.of(o1, o2, o3), true); + } + + @Override + public String toString() { + return constant.toString(); + } + } + + // Inv + + public static final BooleanSupplier sup(boolean b) { + return () -> b; + } + + public static final Supplier sup(T t) { + return () -> t; + } + + // Not + + public static final BooleanSupplier not(BooleanSupplier predicate) { + return () -> !predicate.getAsBoolean(); + } + + // Or + + @SafeVarargs + public static final BooleanSupplier or(BooleanSupplier... predicates) { + return () -> or(List.of(predicates)); + } + + public static final BooleanSupplier any(Collection predicates) { + return () -> or(predicates.asList()); + } + + private static boolean or(List predicates) { + if (predicates.isEmpty()) { + return false; + } else if (predicates.size() == 1) { + return predicates.first().getAsBoolean(); + } else { + List or = predicates.random().asList(); + RuntimeException[] rte = new RuntimeException[1]; + boolean result = or.anyMatch(p -> { + try { + return p.getAsBoolean(); + } catch (NonDeterministicException nde) { + rte[0] = nde; + return false; + } + }); + if (!result && rte[0] != null) { + throw rte[0]; + } else { + return result; + } + } + } + + // And + + @SafeVarargs + public static final BooleanSupplier and(BooleanSupplier... predicates) { + return () -> and(List.of(predicates)); + } + + public static final BooleanSupplier all(Collection predicates) { + return () -> and(predicates.asList()); + } + + private static boolean and(List predicates) { + if (predicates.isEmpty()) { + return true; + } else if (predicates.size() == 1) { + return predicates.first().getAsBoolean(); + } else { + List and = predicates.random().asList(); + RuntimeException[] rte = new RuntimeException[1]; + boolean result = and.anyMatch(p -> { + try { + return p.getAsBoolean(); + } catch (NonDeterministicException nde) { + rte[0] = nde; + return true; + } + }); + if (result && rte[0] != null) { + throw rte[0]; + } else { + return result; + } + } + } + + // Unification + + private static final class UnboundVariableException extends RuntimeException { + private static final long serialVersionUID = 4505117271488648346L; + + private final Object var; + private final Set> vars; + + private UnboundVariableException(Object var, Set> vars) { + this.var = var; + this.vars = vars; + } + } + + private static final class Var { + } + + @SuppressWarnings("unchecked") + public static final BooleanSupplier uni(java.util.function.Function predicate) { + List vars = List.of(new Var()); + return () -> uni(vars, v -> predicate.apply((V1) v.get(0)).getAsBoolean()); + } + + @SuppressWarnings("unchecked") + public static final BooleanSupplier uni(java.util.function.BiFunction predicate) { + List vars = List.of(new Var(), new Var()); + return () -> uni(vars, v -> predicate.apply((V1) v.get(0), (V2) v.get(1)).getAsBoolean()); + } + + @SuppressWarnings("unchecked") + public static final BooleanSupplier uni(org.modelingvalue.collections.util.TriFunction predicate) { + List vars = List.of(new Var(), new Var(), new Var()); + return () -> uni(vars, v -> predicate.apply((V1) v.get(0), (V2) v.get(1), (V3) v.get(2)).getAsBoolean()); + } + + private static boolean uni(List vars, Predicate> predicate) { + try { + return VARIABLES.get(vars, () -> predicate.test(vars)); + } catch (UnboundVariableException uve) { + if (vars.contains(uve.var)) { + return any(uve.vars.map(vs -> () -> uni(vs, predicate))).getAsBoolean(); + } else { + throw uve; + } + } + } + +} diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index c6571be4..f5cbf152 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -20,6 +20,8 @@ package org.modelingvalue.dclare; +import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.Internable; public interface Universe extends Mutable, Internable { @@ -37,4 +39,33 @@ default void exit() { default boolean dIsOrphan(State state) { return false; } + + static Universe of(Feature... features) { + return new Universe() { + private final MutableClass universeClass = new MutableClass() { + + @SuppressWarnings("unchecked") + Set> observers = // + (Set>) Collection.of(features).filter(Observer.class).asSet(); + @SuppressWarnings("unchecked") + Set> setables = // + (Set>) Collection.of(features).filter(Setable.class).asSet(); + + @Override + public Set> dObservers() { + return observers; + } + + @Override + public Set> dSetables() { + return setables; + } + }; + + @Override + public MutableClass dClass() { + return universeClass; + } + }; + } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java new file mode 100644 index 00000000..3711c5a4 --- /dev/null +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -0,0 +1,53 @@ +package org.modelingvalue.dclare.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.modelingvalue.dclare.Logic.*; +import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; + +import org.junit.jupiter.api.RepeatedTest; +import org.modelingvalue.collections.Set; +import org.modelingvalue.dclare.Logic.Fun1; +import org.modelingvalue.dclare.Logic.Rel2; +import org.modelingvalue.dclare.Universe; +import org.modelingvalue.dclare.UniverseTransaction; + +public class LogicTest { + + void run(Runnable test) { + UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); + universeTransaction.put("test", test); + universeTransaction.stop(); + universeTransaction.waitForEnd(); + } + + static final Fun1> PARENTS = fun1("parent"); + + static final Fun1> ANCESTORS = fun1("ancestor", // + (p) -> sup(PARENTS.get(p).addAll(PARENTS.get(p).flatMap(LogicTest.ANCESTORS::get)))); + + static final Rel2 PARENT = rel2("parent", // + (a, b) -> sup(PARENTS.get(a).contains(b))); + + static final Rel2 ANCESTOR1 = rel2("isAncestor", // + (a, o) -> or(PARENT.sup(o, a), // + any(PARENTS.get(o).map(p -> LogicTest.ANCESTOR1.sup(a, p))))); + + static final Rel2 ANCESTOR2 = rel2("isAncestor", // + (a, o) -> or(PARENT.sup(o, a), // + uni((String x) -> and(LogicTest.ANCESTOR1.sup(a, x), PARENT.sup(o, x))))); + + @RepeatedTest(32) + public void test1() { + run(() -> { + PARENTS.set("Jan", Set.of("Carel")); + PARENTS.set("Wim", Set.of("Jan", "Elske")); + PARENTS.set("Joppe", Set.of("Wim", "Heleen")); + PARENTS.set("Marijn", Set.of("Wim", "Heleen")); + assertEquals(ANCESTORS.sup("Joppe"), Set.of("Wim", "Heleen", "Jan", "Elske", "Carel")); + + assertTrue(ANCESTOR1.sup("Carel", "Marijn")); + assertTrue(ANCESTOR1.sup("Wim", "Marijn")); + }); + } +} From bf03b6c2ba222738e4accd0b1ee5cdb3bfaae848 Mon Sep 17 00:00:00 2001 From: automation Date: Thu, 14 Nov 2024 08:01:50 +0000 Subject: [PATCH 059/179] [no-ci] updated by mvgplugin --- .../java/org/modelingvalue/dclare/Logic.java | 20 +++++++++++++++++++ .../modelingvalue/dclare/test/LogicTest.java | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 2c6cba41..9f970a38 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; import java.util.function.BiPredicate; diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 3711c5a4..2180694b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare.test; import static org.junit.jupiter.api.Assertions.assertEquals; From 20e1aba06b4ab965546daa15b8782bd4caeb53e8 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 14 Nov 2024 11:08:02 +0100 Subject: [PATCH 060/179] fixes --- .../org/modelingvalue/dclare/Constant.java | 4 ++ .../java/org/modelingvalue/dclare/Logic.java | 56 +++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 13 +++-- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 5b658b88..6e89e6d3 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -52,6 +52,10 @@ public static Constant of(Object id, V def, Function deriver, return new Constant<>(id, o -> def, null, null, deriver, null, modifiers); } + public static Constant of(Object id, V def, Function deriver, QuadConsumer changed, SetableModifier... modifiers) { + return new Constant<>(id, o -> def, null, null, deriver, changed, modifiers); + } + public static Constant of(Object id, Function deriver, QuadConsumer changed, SetableModifier... modifiers) { return new Constant<>(id, null, null, null, deriver, changed, modifiers); } diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 2c6cba41..0d14874d 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -21,42 +21,42 @@ private Logic() { private static final Context> VARIABLES = Context.of(List.of()); - public static abstract class ClauseType { + public static abstract class Functor { }; // Functions public static final Fun1 fun1(Object id, java.util.function.Function> f) { - return new Fun1(id, (o) -> f.apply(o).get()); + return new Fun1(id, null, (o) -> f.apply(o).get()); } - public static final Fun1 fun1(Object id) { - return new Fun1(id, (o) -> null); + public static final Fun1 fun1(Object id, T def) { + return new Fun1(id, def, null); } public static final Fun2 fun2(Object id, java.util.function.BiFunction> f) { - return new Fun2(id, (o1, o2) -> f.apply(o1, o2).get()); + return new Fun2(id, null, (o1, o2) -> f.apply(o1, o2).get()); } - public static final Fun2 fun2(Object id) { - return new Fun2(id, (o1, o2) -> null); + public static final Fun2 fun2(Object id, T def) { + return new Fun2(id, def, null); } public static final Fun3 function(Object id, org.modelingvalue.collections.util.TriFunction> f) { - return new Fun3(id, (o1, o2, o3) -> f.apply(o1, o2, o3).get()); + return new Fun3(id, null, (o1, o2, o3) -> f.apply(o1, o2, o3).get()); } - public static final Fun3 function(Object id) { - return new Fun3(id, (o1, o2, o3) -> null); + public static final Fun3 function(Object id, T def) { + return new Fun3(id, def, null); } - public static final class Fun1 extends ClauseType { + public static final class Fun1 extends Functor { private final Constant, T> constant; private final Setable, Set>> extend; - private Fun1(Object id, java.util.function.Function f) { + private Fun1(Object id, T def, java.util.function.Function f) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, o -> f.apply(o.a()), (tx, o, b, t) -> { + constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a()), (tx, o, b, t) -> { if (t != null) { extend.add(Single.of(null), o); } @@ -81,13 +81,13 @@ public String toString() { } } - public static final class Fun2 extends ClauseType { + public static final class Fun2 extends Functor { private final Constant, T> constant; private final Setable, Set>> extend; - private Fun2(Object id, java.util.function.BiFunction f) { + private Fun2(Object id, T def, java.util.function.BiFunction f) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, o -> f.apply(o.a(), o.b()), (tx, o, b, t) -> { + constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a(), o.b()), (tx, o, b, t) -> { if (t != null) { extend.add(Pair.of(null, null), o); extend.add(Pair.of(o.a(), null), o); @@ -114,13 +114,13 @@ public String toString() { } } - public static final class Fun3 extends ClauseType { + public static final class Fun3 extends Functor { private final Constant, T> constant; private final Setable, Set>> extend; - private Fun3(Object id, org.modelingvalue.collections.util.TriFunction f) { + private Fun3(Object id, T def, org.modelingvalue.collections.util.TriFunction f) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, o -> f.apply(o.a(), o.b(), o.c()), (tx, o, b, t) -> { + constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a(), o.b(), o.c()), (tx, o, b, t) -> { if (t != null) { extend.add(Triple.of(null, null, null), o); extend.add(Triple.of(o.a(), null, null), o); @@ -159,7 +159,7 @@ public static final Rel1 rel1(Object id, java.util.function.Function Rel1 rel1(Object id) { - return new Rel1(id, (o) -> false); + return new Rel1(id, null); } public static final Rel2 rel2(Object id, java.util.function.BiFunction p) { @@ -167,7 +167,7 @@ public static final Rel2 rel2(Object id, java.util.function.BiF } public static final Rel2 rel2(Object id) { - return new Rel2(id, (o1, o2) -> false); + return new Rel2(id, null); } public static final Rel3 rel3(Object id, org.modelingvalue.collections.util.TriFunction p) { @@ -175,16 +175,16 @@ public static final Rel3 rel3(Object id, org.modelingva } public static final Rel3 rel3(Object id) { - return new Rel3(id, (o1, o2, o3) -> false); + return new Rel3(id, null); } - public static final class Rel1 extends ClauseType { + public static final class Rel1 extends Functor { private final Constant, Boolean> constant; private final Setable, Set>> extend; private Rel1(Object id, Predicate p) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, o -> p.test(o.a()), (tx, o, b, t) -> { + constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a()), (tx, o, b, t) -> { if (t != null) { extend.add(Single.of(null), o); } @@ -211,13 +211,13 @@ public String toString() { } - public static final class Rel2 extends ClauseType { + public static final class Rel2 extends Functor { private final Constant, Boolean> constant; private final Setable, Set>> extend; private Rel2(Object id, BiPredicate p) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, o -> p.test(o.a(), o.b()), (tx, o, b, t) -> { + constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a(), o.b()), (tx, o, b, t) -> { if (t) { extend.add(Pair.of(null, null), o); extend.add(Pair.of(o.a(), null), o); @@ -245,13 +245,13 @@ public String toString() { } } - public static final class Rel3 extends ClauseType { + public static final class Rel3 extends Functor { private final Constant, Boolean> constant; private final Setable, Set>> extend; private Rel3(Object id, TriPredicate p) { extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, o -> p.test(o.a(), o.b(), o.c()), (tx, o, b, t) -> { + constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a(), o.b(), o.c()), (tx, o, b, t) -> { if (t) { extend.add(Triple.of(null, null, null), o); extend.add(Triple.of(o.a(), null, null), o); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 3711c5a4..9f6b5d09 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -21,7 +21,7 @@ void run(Runnable test) { universeTransaction.waitForEnd(); } - static final Fun1> PARENTS = fun1("parent"); + static final Fun1> PARENTS = fun1("parent", Set.of()); static final Fun1> ANCESTORS = fun1("ancestor", // (p) -> sup(PARENTS.get(p).addAll(PARENTS.get(p).flatMap(LogicTest.ANCESTORS::get)))); @@ -35,7 +35,7 @@ void run(Runnable test) { static final Rel2 ANCESTOR2 = rel2("isAncestor", // (a, o) -> or(PARENT.sup(o, a), // - uni((String x) -> and(LogicTest.ANCESTOR1.sup(a, x), PARENT.sup(o, x))))); + uni((String x) -> and(LogicTest.ANCESTOR2.sup(a, x), PARENT.sup(o, x))))); @RepeatedTest(32) public void test1() { @@ -44,10 +44,13 @@ public void test1() { PARENTS.set("Wim", Set.of("Jan", "Elske")); PARENTS.set("Joppe", Set.of("Wim", "Heleen")); PARENTS.set("Marijn", Set.of("Wim", "Heleen")); - assertEquals(ANCESTORS.sup("Joppe"), Set.of("Wim", "Heleen", "Jan", "Elske", "Carel")); + assertEquals(ANCESTORS.get("Joppe"), Set.of("Wim", "Heleen", "Jan", "Elske", "Carel")); - assertTrue(ANCESTOR1.sup("Carel", "Marijn")); - assertTrue(ANCESTOR1.sup("Wim", "Marijn")); + assertTrue(ANCESTOR1.is("Carel", "Marijn")); + assertTrue(ANCESTOR1.is("Wim", "Marijn")); + + assertTrue(ANCESTOR2.is("Carel", "Marijn")); + assertTrue(ANCESTOR2.is("Wim", "Marijn")); }); } } From fb3726dc61184d0e240f35d17abc336717d01b4b Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 14 Nov 2024 14:57:22 +0100 Subject: [PATCH 061/179] Logic unification --- .../java/org/modelingvalue/dclare/Logic.java | 224 ++++++++++++++---- .../modelingvalue/dclare/test/LogicTest.java | 8 +- 2 files changed, 180 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index dbc244da..66943b5d 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -1,23 +1,3 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus ~ -// ~ -// Contributors: ~ -// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ -// --------------------------------------------------------------------------------------------------------------------- ~ -// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ -// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ -// but also our friend. "He will live on in many of the lines of code you see below." ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - package org.modelingvalue.dclare; import java.util.function.BiPredicate; @@ -26,8 +6,11 @@ import java.util.function.Supplier; import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; +import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.struct.Struct; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.Single; @@ -39,9 +22,52 @@ public final class Logic { private Logic() { } - private static final Context> VARIABLES = Context.of(List.of()); + private static final Context> VARIABLES = Context.of(Map.of()); public static abstract class Functor { + + protected final S bind(S in) { + Map vars = VARIABLES.get(); + Object[] array = in.toArray(); + Set empty = Set.of(); + for (int i = 0; i < in.length(); i++) { + Object vin = in.get(i); + if (vars.containsKey(vin)) { + Object vout = vars.get(vin); + array[i] = vout; + if (vout == null) { + empty = empty.add(vin); + } + } + } + S out = copy(array); + if (!empty.isEmpty()) { + Set extend = extend(out); + if (extend.isEmpty()) { + throw new NonDeterministicException(in, constant(), "No match found"); + } else { + Set em = empty; + throw new UnboundVariableException(empty, extend.map(s -> { + Map vs = vars; + for (int i = 0; i < in.length(); i++) { + Object vin = in.get(i); + if (em.contains(vin)) { + vs = vs.put(vin, s.get(i)); + } + } + return vs; + }).asSet()); + } + } + return out; + } + + protected abstract S copy(Object[] array); + + protected abstract Set extend(S s); + + @SuppressWarnings("rawtypes") + protected abstract Constant constant(); }; // Functions @@ -88,7 +114,7 @@ public Supplier sup(O o) { } public T get(O o) { - return constant.get(Single.of(o)); + return constant.get(bind(Single.of(o))); } public void set(O o, T t) { @@ -99,6 +125,24 @@ public void set(O o, T t) { public String toString() { return constant.toString(); } + + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Single.of(array[0]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Single) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } } public static final class Fun2 extends Functor { @@ -121,7 +165,7 @@ public Supplier sup(O1 o1, O2 o2) { } public T get(O1 o1, O2 o2) { - return constant.get(Pair.of(o1, o2)); + return constant.get(bind(Pair.of(o1, o2))); } public void set(O1 o1, O2 o2, T t) { @@ -132,6 +176,24 @@ public void set(O1 o1, O2 o2, T t) { public String toString() { return constant.toString(); } + + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Pair.of(array[0], array[1]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Pair) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } } public static final class Fun3 extends Functor { @@ -158,7 +220,7 @@ public Supplier sup(O1 o1, O2 o2, O3 o3) { } public T get(O1 o1, O2 o2, O3 o3) { - return constant.get(Triple.of(o1, o2, o3)); + return constant.get(bind(Triple.of(o1, o2, o3))); } public void set(O1 o1, O2 o2, O3 o3, T t) { @@ -170,6 +232,24 @@ public String toString() { return constant.toString(); } + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Triple.of(array[0], array[1], array[2]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Triple) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } + } // Relations @@ -217,7 +297,7 @@ public BooleanSupplier sup(O o) { } public boolean is(O o) { - return constant.get(Single.of(o)); + return constant.get(bind(Single.of(o))); } public void set(O o) { @@ -229,6 +309,24 @@ public String toString() { return constant.toString(); } + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Single.of(array[0]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Single) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } + } public static final class Rel2 extends Functor { @@ -252,7 +350,7 @@ public BooleanSupplier sup(O1 o1, O2 o2) { } public boolean is(O1 o1, O2 o2) { - return constant.get(Pair.of(o1, o2)); + return constant.get(bind(Pair.of(o1, o2))); } public void set(O1 o1, O2 o2) { @@ -263,6 +361,24 @@ public void set(O1 o1, O2 o2) { public String toString() { return constant.toString(); } + + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Pair.of(array[0], array[1]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Pair) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } } public static final class Rel3 extends Functor { @@ -290,7 +406,7 @@ public BooleanSupplier sup(O1 o1, O2 o2, O3 o3) { } public boolean is(O1 o1, O2 o2, O3 o3) { - return constant.get(Triple.of(o1, o2, o3)); + return constant.get(bind(Triple.of(o1, o2, o3))); } public void set(O1 o1, O2 o2, O3 o3) { @@ -301,6 +417,24 @@ public void set(O1 o1, O2 o2, O3 o3) { public String toString() { return constant.toString(); } + + @SuppressWarnings("unchecked") + @Override + protected S copy(Object[] array) { + return (S) Triple.of(array[0], array[1], array[2]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + protected Set extend(S s) { + return extend.get((Triple) s); + } + + @SuppressWarnings("rawtypes") + @Override + protected Constant constant() { + return constant; + } } // Inv @@ -392,44 +526,38 @@ private static boolean and(List predicates) { // Unification private static final class UnboundVariableException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; + private static final long serialVersionUID = 4505117271488648346L; - private final Object var; - private final Set> vars; + private final Set vars; + private final Set> bindings; - private UnboundVariableException(Object var, Set> vars) { - this.var = var; + private UnboundVariableException(Set vars, Set> bindings) { this.vars = vars; + this.bindings = bindings; } } - private static final class Var { - } - @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(java.util.function.Function predicate) { - List vars = List.of(new Var()); - return () -> uni(vars, v -> predicate.apply((V1) v.get(0)).getAsBoolean()); + public static final BooleanSupplier uni(V1 v1, BooleanSupplier predicate) { + return () -> doUni(Collection.of(v1).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); } @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(java.util.function.BiFunction predicate) { - List vars = List.of(new Var(), new Var()); - return () -> uni(vars, v -> predicate.apply((V1) v.get(0), (V2) v.get(1)).getAsBoolean()); + public static final BooleanSupplier uni(V1 v1, V2 v2, BooleanSupplier predicate) { + return () -> doUni(Collection.of(v1, v2).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); } @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(org.modelingvalue.collections.util.TriFunction predicate) { - List vars = List.of(new Var(), new Var(), new Var()); - return () -> uni(vars, v -> predicate.apply((V1) v.get(0), (V2) v.get(1), (V3) v.get(2)).getAsBoolean()); + public static final BooleanSupplier uni(V1 v1, V2 v2, V3 v3, BooleanSupplier predicate) { + return () -> doUni(Collection.of(v1, v2, v3).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); } - private static boolean uni(List vars, Predicate> predicate) { + private static boolean doUni(Map vars, Supplier predicate) { try { - return VARIABLES.get(vars, () -> predicate.test(vars)); + return VARIABLES.get(vars, predicate); } catch (UnboundVariableException uve) { - if (vars.contains(uve.var)) { - return any(uve.vars.map(vs -> () -> uni(vs, predicate))).getAsBoolean(); + if (uve.vars.anyMatch(vars::containsKey)) { + return any(uve.bindings.map(vs -> () -> doUni(vs, predicate))).getAsBoolean(); } else { throw uve; } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index f27b5fb7..4ea2f6ec 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -43,19 +43,19 @@ void run(Runnable test) { static final Fun1> PARENTS = fun1("parent", Set.of()); - static final Fun1> ANCESTORS = fun1("ancestor", // + static final Fun1> ANCESTORS = fun1("ancestors", // (p) -> sup(PARENTS.get(p).addAll(PARENTS.get(p).flatMap(LogicTest.ANCESTORS::get)))); static final Rel2 PARENT = rel2("parent", // (a, b) -> sup(PARENTS.get(a).contains(b))); - static final Rel2 ANCESTOR1 = rel2("isAncestor", // + static final Rel2 ANCESTOR1 = rel2("ancestor1", // (a, o) -> or(PARENT.sup(o, a), // any(PARENTS.get(o).map(p -> LogicTest.ANCESTOR1.sup(a, p))))); - static final Rel2 ANCESTOR2 = rel2("isAncestor", // + static final Rel2 ANCESTOR2 = rel2("ancestor2", // (a, o) -> or(PARENT.sup(o, a), // - uni((String x) -> and(LogicTest.ANCESTOR2.sup(a, x), PARENT.sup(o, x))))); + uni("X", and(LogicTest.ANCESTOR2.sup(a, "X"), PARENT.sup(o, "X"))))); @RepeatedTest(32) public void test1() { From 19dfce9925de7894db389ca85c27123560b84985 Mon Sep 17 00:00:00 2001 From: automation Date: Thu, 14 Nov 2024 13:58:24 +0000 Subject: [PATCH 062/179] [no-ci] updated by mvgplugin --- .../java/org/modelingvalue/dclare/Logic.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 66943b5d..aa8027b9 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; import java.util.function.BiPredicate; From a7322c621a589d404d71235eafe776fb654e2283 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 14 Nov 2024 16:59:19 +0100 Subject: [PATCH 063/179] unification --- .../java/org/modelingvalue/dclare/Logic.java | 56 ++++--------------- .../dclare/ex/NonDeterministicException.java | 4 +- 2 files changed, 12 insertions(+), 48 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 66943b5d..2b33ac96 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -22,9 +22,10 @@ public final class Logic { private Logic() { } - private static final Context> VARIABLES = Context.of(Map.of()); + private static final Context> VARIABLES = Context.of(Map.of()); + private static final String NO_MATCH_FOUND = "No match found"; - public static abstract class Functor { + public static abstract class Functor implements Feature { protected final S bind(S in) { Map vars = VARIABLES.get(); @@ -44,7 +45,7 @@ protected final S bind(S in) { if (!empty.isEmpty()) { Set extend = extend(out); if (extend.isEmpty()) { - throw new NonDeterministicException(in, constant(), "No match found"); + throw new NonDeterministicException(in, this, NO_MATCH_FOUND); } else { Set em = empty; throw new UnboundVariableException(empty, extend.map(s -> { @@ -65,9 +66,6 @@ protected final S bind(S in) { protected abstract S copy(Object[] array); protected abstract Set extend(S s); - - @SuppressWarnings("rawtypes") - protected abstract Constant constant(); }; // Functions @@ -137,12 +135,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Single) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } } public static final class Fun2 extends Functor { @@ -188,12 +180,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Pair) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } } public static final class Fun3 extends Functor { @@ -243,13 +229,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Triple) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } - } // Relations @@ -320,13 +299,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Single) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } - } public static final class Rel2 extends Functor { @@ -373,12 +345,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Pair) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } } public static final class Rel3 extends Functor { @@ -429,12 +395,6 @@ protected S copy(Object[] array) { protected Set extend(S s) { return extend.get((Triple) s); } - - @SuppressWarnings("rawtypes") - @Override - protected Constant constant() { - return constant; - } } // Inv @@ -476,7 +436,9 @@ private static boolean or(List predicates) { try { return p.getAsBoolean(); } catch (NonDeterministicException nde) { - rte[0] = nde; + if (!(nde.getFeature() instanceof Functor)) { + rte[0] = nde; + } return false; } }); @@ -511,7 +473,9 @@ private static boolean and(List predicates) { try { return p.getAsBoolean(); } catch (NonDeterministicException nde) { - rte[0] = nde; + if (!(nde.getFeature() instanceof Functor)) { + rte[0] = nde; + } return true; } }); diff --git a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java index 7f91eab1..640cd8e1 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java @@ -20,12 +20,12 @@ package org.modelingvalue.dclare.ex; -import org.modelingvalue.dclare.Setable; +import org.modelingvalue.dclare.Feature; public final class NonDeterministicException extends ConsistencyError { private static final long serialVersionUID = 7857822332170335179L; - public NonDeterministicException(Object object, Setable feature, String message) { + public NonDeterministicException(Object object, Feature feature, String message) { super(object, feature, 10, message); } From 782c1c6bbea430591c0dc0309a11770c88dd6aa1 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 16 Nov 2024 15:36:59 +0100 Subject: [PATCH 064/179] better logic --- .../org/modelingvalue/dclare/Constant.java | 8 +- .../modelingvalue/dclare/ConstantState.java | 12 +- .../java/org/modelingvalue/dclare/Logic.java | 468 +++++++----------- .../modelingvalue/dclare/test/LogicTest.java | 53 +- 4 files changed, 220 insertions(+), 321 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 6e89e6d3..31ef100e 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -94,7 +94,13 @@ public boolean isDurable() { public T set(O object, BiFunction function, E element) { LeafTransaction leafTransaction = currentLeaf(object); ConstantState constants = leafTransaction.constantState(); - return constants.set(leafTransaction, object, this, function, element); + return constants.set(leafTransaction, object, this, function, element, false); + } + + public T force(O object, BiFunction function, E element) { + LeafTransaction leafTransaction = currentLeaf(object); + ConstantState constants = leafTransaction.constantState(); + return constants.set(leafTransaction, object, this, function, element, true); } @Override diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index daee74c8..ea9e9cca 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -194,12 +194,12 @@ public V set(ILeafTransaction cch, O object, Constant constant, V soll } @SuppressWarnings("unchecked") - public V set(ILeafTransaction cch, O object, Constant constant, BiFunction function, E element) { + public V set(ILeafTransaction cch, O object, Constant constant, BiFunction function, E element, boolean forced) { Map, Object> prev = constants; V ist = (V) prev.get(constant); - V soll = function.apply(ist, element); - if (ist == null) { - ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, false); + V soll = function.apply(ist == null ? constant.getDefault(object) : ist == NULL ? null : ist, element); + if (ist == null || forced) { + ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, forced); } if (!Objects.equals(ist == NULL ? null : ist, soll)) { throw new NonDeterministicException(object, constant, "Constant is not consistent " + StringUtil.toString(object) + "." + constant + "=" + StringUtil.toString(ist) + "!=" + StringUtil.toString(soll)); @@ -328,8 +328,8 @@ public V set(ILeafTransaction cch, O object, Constant constant, V v return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, value, forced); } - public V set(ILeafTransaction cch, O object, Constant constant, BiFunction deriver, E element) { - return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, deriver, element); + public V set(ILeafTransaction cch, O object, Constant constant, BiFunction deriver, E element, boolean forced) { + return getConstants(cch, object, referenceType(constant)).set(cch, object, constant, deriver, element, forced); } private ReferenceType referenceType(Constant constant) { diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 7090db66..c696b450 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -22,6 +22,7 @@ import java.util.function.BiPredicate; import java.util.function.BooleanSupplier; +import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -33,227 +34,119 @@ import org.modelingvalue.collections.struct.Struct; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; +import org.modelingvalue.collections.util.QuadPredicate; +import org.modelingvalue.collections.util.Quadruple; import org.modelingvalue.collections.util.Single; import org.modelingvalue.collections.util.TriPredicate; import org.modelingvalue.collections.util.Triple; -import org.modelingvalue.dclare.ex.NonDeterministicException; public final class Logic { private Logic() { } - private static final Context> VARIABLES = Context.of(Map.of()); - private static final String NO_MATCH_FOUND = "No match found"; + @SuppressWarnings("rawtypes") + private static final Context>> DERIVED = Context.of(List.of()); - public static abstract class Functor implements Feature { + private static final class CircularLogicException extends RuntimeException { + private static final long serialVersionUID = 293433487448006753L; - protected final S bind(S in) { - Map vars = VARIABLES.get(); - Object[] array = in.toArray(); - Set empty = Set.of(); - for (int i = 0; i < in.length(); i++) { - Object vin = in.get(i); - if (vars.containsKey(vin)) { - Object vout = vars.get(vin); - array[i] = vout; - if (vout == null) { - empty = empty.add(vin); - } - } - } - S out = copy(array); - if (!empty.isEmpty()) { - Set extend = extend(out); - if (extend.isEmpty()) { - throw new NonDeterministicException(in, this, NO_MATCH_FOUND); - } else { - Set em = empty; - throw new UnboundVariableException(empty, extend.map(s -> { - Map vs = vars; - for (int i = 0; i < in.length(); i++) { - Object vin = in.get(i); - if (em.contains(vin)) { - vs = vs.put(vin, s.get(i)); - } - } - return vs; - }).asSet()); - } - } - return out; - } - - protected abstract S copy(Object[] array); - - protected abstract Set extend(S s); - }; - - // Functions - - public static final Fun1 fun1(Object id, java.util.function.Function> f) { - return new Fun1(id, null, (o) -> f.apply(o).get()); - } - - public static final Fun1 fun1(Object id, T def) { - return new Fun1(id, def, null); - } - - public static final Fun2 fun2(Object id, java.util.function.BiFunction> f) { - return new Fun2(id, null, (o1, o2) -> f.apply(o1, o2).get()); - } - - public static final Fun2 fun2(Object id, T def) { - return new Fun2(id, def, null); - } - - public static final Fun3 function(Object id, org.modelingvalue.collections.util.TriFunction> f) { - return new Fun3(id, null, (o1, o2, o3) -> f.apply(o1, o2, o3).get()); - } - - public static final Fun3 function(Object id, T def) { - return new Fun3(id, def, null); - } + @SuppressWarnings("rawtypes") + private final List> derived; - public static final class Fun1 extends Functor { - private final Constant, T> constant; - private final Setable, Set>> extend; - - private Fun1(Object id, T def, java.util.function.Function f) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a()), (tx, o, b, t) -> { - if (t != null) { - extend.add(Single.of(null), o); - } - }); - } - - public Supplier sup(O o) { - return () -> get(o); - } - - public T get(O o) { - return constant.get(bind(Single.of(o))); - } - - public void set(O o, T t) { - constant.force(Single.of(o), t); + @SuppressWarnings("rawtypes") + private CircularLogicException(List> derived, Pair current) { + int i = derived.firstIndexOf(current); + this.derived = derived.sublist(0, i + 1).prepend(current); } @Override - public String toString() { - return constant.toString(); - } - - @SuppressWarnings("unchecked") - @Override - protected S copy(Object[] array) { - return (S) Single.of(array[0]); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Single) s); + public String getMessage() { + return "Cycle " + derived.reverse().asList().toString().substring(4); } } - public static final class Fun2 extends Functor { - private final Constant, T> constant; - private final Setable, Set>> extend; - - private Fun2(Object id, T def, java.util.function.BiFunction f) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a(), o.b()), (tx, o, b, t) -> { - if (t != null) { - extend.add(Pair.of(null, null), o); - extend.add(Pair.of(o.a(), null), o); - extend.add(Pair.of(null, o.b()), o); - } - }); - } - - public Supplier sup(O1 o1, O2 o2) { - return () -> get(o1, o2); - } - - public T get(O1 o1, O2 o2) { - return constant.get(bind(Pair.of(o1, o2))); - } + public static abstract class Functor { + private final Constant> extend; - public void set(O1 o1, O2 o2, T t) { - constant.force(Pair.of(o1, o2), t); + protected Functor(Object id) { + extend = Constant.> of(Single.of(id), Set.of(), CoreSetableModifier.durable); } - @Override - public String toString() { - return constant.toString(); - } - - @SuppressWarnings("unchecked") - @Override - protected S copy(Object[] array) { - return (S) Pair.of(array[0], array[1]); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Pair) s); - } - } - - public static final class Fun3 extends Functor { - private final Constant, T> constant; - private final Setable, Set>> extend; - - private Fun3(Object id, T def, org.modelingvalue.collections.util.TriFunction f) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., T> of(id, def, f == null ? null : o -> f.apply(o.a(), o.b(), o.c()), (tx, o, b, t) -> { - if (t != null) { - extend.add(Triple.of(null, null, null), o); - extend.add(Triple.of(o.a(), null, null), o); - extend.add(Triple.of(null, o.b(), null), o); - extend.add(Triple.of(null, null, o.c()), o); - extend.add(Triple.of(o.a(), o.b(), null), o); - extend.add(Triple.of(o.a(), null, o.c()), o); - extend.add(Triple.of(null, o.b(), o.c()), o); + @SuppressWarnings("rawtypes") + protected final Function derive(Function f) { + return o -> { + Pair slot = Pair.of(this, o); + List> pre = DERIVED.get(); + if (pre.contains(slot)) { + throw new CircularLogicException(pre, slot); + } else { + return DERIVED.get(pre.prepend(slot), () -> f.apply(o)); } - }); + }; } - public Supplier sup(O1 o1, O2 o2, O3 o3) { - return () -> get(o1, o2, o3); - } - - public T get(O1 o1, O2 o2, O3 o3) { - return constant.get(bind(Triple.of(o1, o2, o3))); - } - - public void set(O1 o1, O2 o2, O3 o3, T t) { - constant.force(Triple.of(o1, o2, o3), t); + protected final S bind(S in) { + Map vars = VARIABLES.get(); + if (!vars.isEmpty()) { + Object[] array = in.toArray(); + Set empty = Set.of(); + for (int i = 0; i < in.length(); i++) { + Object vin = in.get(i); + if (vars.containsKey(vin)) { + Object vout = vars.get(vin); + array[i] = vout; + if (vout == null) { + empty = empty.add(vin); + } + } + } + if (!empty.isEmpty()) { + Set set = extend.get(copy(array)); + if (!set.isEmpty()) { + Set em = empty; + throw new UnboundVariableException(empty, set.map(s -> { + Map vs = vars; + for (int i = 0; i < in.length(); i++) { + Object vin = in.get(i); + if (em.contains(vin)) { + vs = vs.put(vin, s.get(i)); + } + } + return vs; + }).asSet()); + } + } + } + return in; } - @Override - public String toString() { - return constant.toString(); + protected final void extend(S in) { + extend(0, in, in.toArray()); } - @SuppressWarnings("unchecked") - @Override - protected S copy(Object[] array) { - return (S) Triple.of(array[0], array[1], array[2]); + private void extend(int i, S in, Object[] array) { + if (i < array.length) { + array = array.clone(); + if (array[i] == null) { + array[i] = in.get(i); + extend.force(copy(array), Set::add, in); + } + extend(i + 1, in, array); + if (array[i] != null) { + array[i] = null; + extend.force(copy(array), Set::add, in); + } + extend(i + 1, in, array); + } } - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Triple) s); - } - } + protected abstract S copy(Object[] array); + }; // Relations - public static final Rel1 rel1(Object id, java.util.function.Function p) { + public static final Rel1 rel1(Object id, // + java.util.function.Function p) { return new Rel1(id, (o) -> p.apply(o).getAsBoolean()); } @@ -261,7 +154,8 @@ public static final Rel1 rel1(Object id) { return new Rel1(id, null); } - public static final Rel2 rel2(Object id, java.util.function.BiFunction p) { + public static final Rel2 rel2(Object id, // + java.util.function.BiFunction p) { return new Rel2(id, (o1, o2) -> p.apply(o1, o2).getAsBoolean()); } @@ -269,7 +163,8 @@ public static final Rel2 rel2(Object id) { return new Rel2(id, null); } - public static final Rel3 rel3(Object id, org.modelingvalue.collections.util.TriFunction p) { + public static final Rel3 rel3(Object id, // + org.modelingvalue.collections.util.TriFunction p) { return new Rel3(id, (o1, o2, o3) -> p.apply(o1, o2, o3).getAsBoolean()); } @@ -277,30 +172,32 @@ public static final Rel3 rel3(Object id) { return new Rel3(id, null); } - public static final class Rel1 extends Functor { - private final Constant, Boolean> constant; - private final Setable, Set>> extend; + public static final Rel4 rel4(Object id, // + org.modelingvalue.collections.util.QuadFunction p) { + return new Rel4(id, (o1, o2, o3, o4) -> p.apply(o1, o2, o3, o4).getAsBoolean()); + } + + public static final Rel4 rel4(Object id) { + return new Rel4(id, null); + } + + public static final class Rel1 extends Functor> { + private final Constant, Boolean> constant; private Rel1(Object id, Predicate p) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a()), (tx, o, b, t) -> { - if (t != null) { - extend.add(Single.of(null), o); - } - }); + super(id); + constant = Constant., Boolean> of(id, p != null ? null : false, // + p == null ? null : derive(o -> p.test(o.a())), // + (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") - public BooleanSupplier sup(O o) { - return () -> is(o); + public BooleanSupplier is(O o) { + return () -> constant.get(bind(Single.of(o))); } - public boolean is(O o) { - return constant.get(bind(Single.of(o))); - } - - public void set(O o) { - constant.force(Single.of(o), true); + public void fact(O o) { + constant.set(Single.of(o), true); } @Override @@ -310,43 +207,28 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected S copy(Object[] array) { - return (S) Single.of(array[0]); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Single) s); + protected Single copy(Object[] array) { + return Single.of((O) array[0]); } } - public static final class Rel2 extends Functor { - private final Constant, Boolean> constant; - private final Setable, Set>> extend; + public static final class Rel2 extends Functor> { + private final Constant, Boolean> constant; private Rel2(Object id, BiPredicate p) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a(), o.b()), (tx, o, b, t) -> { - if (t) { - extend.add(Pair.of(null, null), o); - extend.add(Pair.of(o.a(), null), o); - extend.add(Pair.of(null, o.b()), o); - } - }); + super(id); + constant = Constant., Boolean> of(id, p != null ? null : false, // + p == null ? null : derive(o -> p.test(o.a(), o.b())), // + (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") - public BooleanSupplier sup(O1 o1, O2 o2) { - return () -> is(o1, o2); - } - - public boolean is(O1 o1, O2 o2) { - return constant.get(bind(Pair.of(o1, o2))); + public BooleanSupplier is(O1 o1, O2 o2) { + return () -> constant.get(bind(Pair.of(o1, o2))); } - public void set(O1 o1, O2 o2) { - constant.force(Pair.of(o1, o2), true); + public void fact(O1 o1, O2 o2) { + constant.set(Pair.of(o1, o2), true); } @Override @@ -356,47 +238,28 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected S copy(Object[] array) { - return (S) Pair.of(array[0], array[1]); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Pair) s); + protected Pair copy(Object[] array) { + return Pair.of((O1) array[0], (O2) array[1]); } } - public static final class Rel3 extends Functor { - private final Constant, Boolean> constant; - private final Setable, Set>> extend; + public static final class Rel3 extends Functor> { + private final Constant, Boolean> constant; private Rel3(Object id, TriPredicate p) { - extend = Setable., Set>> of(Single.of(id), Set.of()); - constant = Constant., Boolean> of(id, p != null ? null : false, p == null ? null : o -> p.test(o.a(), o.b(), o.c()), (tx, o, b, t) -> { - if (t) { - extend.add(Triple.of(null, null, null), o); - extend.add(Triple.of(o.a(), null, null), o); - extend.add(Triple.of(null, o.b(), null), o); - extend.add(Triple.of(null, null, o.c()), o); - extend.add(Triple.of(o.a(), o.b(), null), o); - extend.add(Triple.of(o.a(), null, o.c()), o); - extend.add(Triple.of(null, o.b(), o.c()), o); - } - }); + super(id); + constant = Constant., Boolean> of(id, p != null ? null : false, // + p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c())), // + (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") - public BooleanSupplier sup(O1 o1, O2 o2, O3 o3) { - return () -> is(o1, o2, o3); - } - - public boolean is(O1 o1, O2 o2, O3 o3) { - return constant.get(bind(Triple.of(o1, o2, o3))); + public BooleanSupplier is(O1 o1, O2 o2, O3 o3) { + return () -> constant.get(bind(Triple.of(o1, o2, o3))); } - public void set(O1 o1, O2 o2, O3 o3) { - constant.force(Triple.of(o1, o2, o3), true); + public void fact(O1 o1, O2 o2, O3 o3) { + constant.set(Triple.of(o1, o2, o3), true); } @Override @@ -406,25 +269,40 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected S copy(Object[] array) { - return (S) Triple.of(array[0], array[1], array[2]); + protected Triple copy(Object[] array) { + return Triple.of((O1) array[0], (O2) array[1], (O3) array[2]); } + } - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - protected Set extend(S s) { - return extend.get((Triple) s); + public static final class Rel4 extends Functor> { + private final Constant, Boolean> constant; + + private Rel4(Object id, QuadPredicate p) { + super(id); + constant = Constant., Boolean> of(id, p != null ? null : false, // + p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c(), o.d())), // + (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); } - } - // Inv + @SuppressWarnings("unchecked") + public BooleanSupplier is(O1 o1, O2 o2, O3 o3, O4 o4) { + return () -> constant.get(bind(Quadruple.of(o1, o2, o3, o4))); + } - public static final BooleanSupplier sup(boolean b) { - return () -> b; - } + public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { + constant.set(Quadruple.of(o1, o2, o3, o4), true); + } + + @Override + public String toString() { + return constant.toString(); + } - public static final Supplier sup(T t) { - return () -> t; + @SuppressWarnings("unchecked") + @Override + protected Quadruple copy(Object[] array) { + return Quadruple.of((O1) array[0], (O2) array[1], (O3) array[2], (O4) array[3]); + } } // Not @@ -451,18 +329,21 @@ private static boolean or(List predicates) { return predicates.first().getAsBoolean(); } else { List or = predicates.random().asList(); - RuntimeException[] rte = new RuntimeException[1]; + RuntimeException[] rte = new RuntimeException[2]; boolean result = or.anyMatch(p -> { try { return p.getAsBoolean(); - } catch (NonDeterministicException nde) { - if (!(nde.getFeature() instanceof Functor)) { - rte[0] = nde; - } + } catch (CircularLogicException cle) { + rte[0] = cle; return false; + } catch (UnboundVariableException uve) { + rte[1] = uve; + return true; } }); - if (!result && rte[0] != null) { + if (rte[1] != null) { + throw rte[1]; + } else if (!result && rte[0] != null) { throw rte[0]; } else { return result; @@ -488,18 +369,21 @@ private static boolean and(List predicates) { return predicates.first().getAsBoolean(); } else { List and = predicates.random().asList(); - RuntimeException[] rte = new RuntimeException[1]; + RuntimeException[] rte = new RuntimeException[2]; boolean result = and.anyMatch(p -> { try { return p.getAsBoolean(); - } catch (NonDeterministicException nde) { - if (!(nde.getFeature() instanceof Functor)) { - rte[0] = nde; - } + } catch (CircularLogicException cle) { + rte[0] = cle; return true; + } catch (UnboundVariableException uve) { + rte[1] = uve; + return false; } }); - if (result && rte[0] != null) { + if (rte[1] != null) { + throw rte[1]; + } else if (result && rte[0] != null) { throw rte[0]; } else { return result; @@ -509,6 +393,8 @@ private static boolean and(List predicates) { // Unification + private static final Context> VARIABLES = Context.of(Map.of()); + private static final class UnboundVariableException extends RuntimeException { private static final long serialVersionUID = 4505117271488648346L; diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 4ea2f6ec..6f9bfe6b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -20,14 +20,13 @@ package org.modelingvalue.dclare.test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; +import java.util.function.BooleanSupplier; + import org.junit.jupiter.api.RepeatedTest; -import org.modelingvalue.collections.Set; -import org.modelingvalue.dclare.Logic.Fun1; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -41,36 +40,44 @@ void run(Runnable test) { universeTransaction.waitForEnd(); } - static final Fun1> PARENTS = fun1("parent", Set.of()); + static void isTrue(BooleanSupplier bs) { + assertTrue(bs.getAsBoolean()); + } - static final Fun1> ANCESTORS = fun1("ancestors", // - (p) -> sup(PARENTS.get(p).addAll(PARENTS.get(p).flatMap(LogicTest.ANCESTORS::get)))); + static void isFalse(BooleanSupplier bs) { + assertTrue(!bs.getAsBoolean()); + } - static final Rel2 PARENT = rel2("parent", // - (a, b) -> sup(PARENTS.get(a).contains(b))); + static final String X = "$X"; - static final Rel2 ANCESTOR1 = rel2("ancestor1", // - (a, o) -> or(PARENT.sup(o, a), // - any(PARENTS.get(o).map(p -> LogicTest.ANCESTOR1.sup(a, p))))); + static final Rel2 PARENT = rel2("parent"); - static final Rel2 ANCESTOR2 = rel2("ancestor2", // - (a, o) -> or(PARENT.sup(o, a), // - uni("X", and(LogicTest.ANCESTOR2.sup(a, "X"), PARENT.sup(o, "X"))))); + static final Rel2 ANCESTOR = rel2("ancestor", // + (a, o) -> or(PARENT.is(a, o), // + uni(X, and(LogicTest.ANCESTOR.is(a, X), PARENT.is(X, o))))); @RepeatedTest(32) public void test1() { run(() -> { - PARENTS.set("Jan", Set.of("Carel")); - PARENTS.set("Wim", Set.of("Jan", "Elske")); - PARENTS.set("Joppe", Set.of("Wim", "Heleen")); - PARENTS.set("Marijn", Set.of("Wim", "Heleen")); - assertEquals(ANCESTORS.get("Joppe"), Set.of("Wim", "Heleen", "Jan", "Elske", "Carel")); + PARENT.fact("Carel", "Jan"); + PARENT.fact("Jan", "Wim"); + PARENT.fact("Elske", "Wim"); + PARENT.fact("Wim", "Joppe"); + PARENT.fact("Heleen", "Joppe"); + PARENT.fact("Wim", "Marijn"); + PARENT.fact("Heleeen", "Marijn"); + + isTrue(PARENT.is("Heleen", "Joppe")); + isTrue(PARENT.is("Jan", "Wim")); + + isFalse(PARENT.is("Marijn", "Wim")); + isFalse(PARENT.is("Heleeen", "Wim")); - assertTrue(ANCESTOR1.is("Carel", "Marijn")); - assertTrue(ANCESTOR1.is("Wim", "Marijn")); + isTrue(ANCESTOR.is("Carel", "Marijn")); + isTrue(ANCESTOR.is("Wim", "Marijn")); - assertTrue(ANCESTOR2.is("Carel", "Marijn")); - assertTrue(ANCESTOR2.is("Wim", "Marijn")); + isFalse(ANCESTOR.is("Marijn", "Wim")); + isFalse(ANCESTOR.is("Heleeen", "Wim")); }); } } From a1be7f913b45385ad108c6ae7a8823a1f5fb10e1 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 16 Nov 2024 15:43:41 +0100 Subject: [PATCH 065/179] explicit exception handling --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 6f9bfe6b..106212e0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -26,7 +26,6 @@ import java.util.function.BooleanSupplier; -import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -56,7 +55,7 @@ static void isFalse(BooleanSupplier bs) { (a, o) -> or(PARENT.is(a, o), // uni(X, and(LogicTest.ANCESTOR.is(a, X), PARENT.is(X, o))))); - @RepeatedTest(32) + // @RepeatedTest(32) public void test1() { run(() -> { PARENT.fact("Carel", "Jan"); @@ -78,6 +77,7 @@ public void test1() { isFalse(ANCESTOR.is("Marijn", "Wim")); isFalse(ANCESTOR.is("Heleeen", "Wim")); + isFalse(ANCESTOR.is("Joppe", "Carel")); }); } } From d571c9bea9aaf86310014c3f67c3380d906c5a8a Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 16 Nov 2024 20:06:04 +0100 Subject: [PATCH 066/179] first successful test of logic --- .../java/org/modelingvalue/dclare/Logic.java | 70 +++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 3 +- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index c696b450..fba5c33b 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -20,6 +20,7 @@ package org.modelingvalue.dclare; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiPredicate; import java.util.function.BooleanSupplier; import java.util.function.Function; @@ -47,7 +48,7 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Context>> DERIVED = Context.of(List.of()); - private static final class CircularLogicException extends RuntimeException { + public static final class CircularLogicException extends RuntimeException { private static final long serialVersionUID = 293433487448006753L; @SuppressWarnings("rawtypes") @@ -88,20 +89,23 @@ protected final Function derive(Function f) { protected final S bind(S in) { Map vars = VARIABLES.get(); if (!vars.isEmpty()) { - Object[] array = in.toArray(); + Object[] pat = in.toArray(); + Object[] out = in.toArray(); Set empty = Set.of(); for (int i = 0; i < in.length(); i++) { Object vin = in.get(i); if (vars.containsKey(vin)) { Object vout = vars.get(vin); - array[i] = vout; if (vout == null) { + pat[i] = null; empty = empty.add(vin); + } else { + out[i] = vout; } } } if (!empty.isEmpty()) { - Set set = extend.get(copy(array)); + Set set = extend.get(copy(pat)); if (!set.isEmpty()) { Set em = empty; throw new UnboundVariableException(empty, set.map(s -> { @@ -116,12 +120,16 @@ protected final S bind(S in) { }).asSet()); } } + return copy(out); } return in; } - protected final void extend(S in) { - extend(0, in, in.toArray()); + @SuppressWarnings("rawtypes") + protected final void extend(S in, Boolean res, boolean der) { + if (res && !der) { + extend(0, in, in.toArray()); + } } private void extend(int i, S in, Object[] array) { @@ -188,7 +196,7 @@ private Rel1(Object id, Predicate p) { super(id); constant = Constant., Boolean> of(id, p != null ? null : false, // p == null ? null : derive(o -> p.test(o.a())), // - (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); + (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") @@ -219,7 +227,7 @@ private Rel2(Object id, BiPredicate p) { super(id); constant = Constant., Boolean> of(id, p != null ? null : false, // p == null ? null : derive(o -> p.test(o.a(), o.b())), // - (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); + (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") @@ -250,7 +258,7 @@ private Rel3(Object id, TriPredicate p) { super(id); constant = Constant., Boolean> of(id, p != null ? null : false, // p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c())), // - (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); + (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") @@ -281,7 +289,7 @@ private Rel4(Object id, QuadPredicate p) { super(id); constant = Constant., Boolean> of(id, p != null ? null : false, // p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c(), o.d())), // - (tx, o, b, t) -> extend(o), CoreSetableModifier.durable); + (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); } @SuppressWarnings("unchecked") @@ -329,22 +337,23 @@ private static boolean or(List predicates) { return predicates.first().getAsBoolean(); } else { List or = predicates.random().asList(); - RuntimeException[] rte = new RuntimeException[2]; + AtomicReference ref = new AtomicReference<>(null); boolean result = or.anyMatch(p -> { try { return p.getAsBoolean(); - } catch (CircularLogicException cle) { - rte[0] = cle; - return false; } catch (UnboundVariableException uve) { - rte[1] = uve; + ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); return true; + } catch (CircularLogicException cle) { + ref.updateAndGet(rte -> rte == null ? cle : rte); + return false; } }); - if (rte[1] != null) { - throw rte[1]; - } else if (!result && rte[0] != null) { - throw rte[0]; + RuntimeException exc = ref.get(); + if (exc instanceof UnboundVariableException) { + throw exc; + } else if (!result && exc != null) { + throw exc; } else { return result; } @@ -369,22 +378,23 @@ private static boolean and(List predicates) { return predicates.first().getAsBoolean(); } else { List and = predicates.random().asList(); - RuntimeException[] rte = new RuntimeException[2]; - boolean result = and.anyMatch(p -> { + AtomicReference ref = new AtomicReference<>(null); + boolean result = and.allMatch(p -> { try { return p.getAsBoolean(); - } catch (CircularLogicException cle) { - rte[0] = cle; - return true; } catch (UnboundVariableException uve) { - rte[1] = uve; + ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); return false; + } catch (CircularLogicException cle) { + ref.updateAndGet(rte -> rte == null ? cle : rte); + return true; } }); - if (rte[1] != null) { - throw rte[1]; - } else if (result && rte[0] != null) { - throw rte[0]; + RuntimeException exc = ref.get(); + if (exc instanceof UnboundVariableException) { + throw exc; + } else if (result && exc != null) { + throw exc; } else { return result; } @@ -395,7 +405,7 @@ private static boolean and(List predicates) { private static final Context> VARIABLES = Context.of(Map.of()); - private static final class UnboundVariableException extends RuntimeException { + public static final class UnboundVariableException extends RuntimeException { private static final long serialVersionUID = 4505117271488648346L; private final Set vars; diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 106212e0..5632baa1 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -26,6 +26,7 @@ import java.util.function.BooleanSupplier; +import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -55,7 +56,7 @@ static void isFalse(BooleanSupplier bs) { (a, o) -> or(PARENT.is(a, o), // uni(X, and(LogicTest.ANCESTOR.is(a, X), PARENT.is(X, o))))); - // @RepeatedTest(32) + @RepeatedTest(512) public void test1() { run(() -> { PARENT.fact("Carel", "Jan"); From 54b882998c39d2806a8addb5dea60de7dd91101f Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 16 Nov 2024 20:31:39 +0100 Subject: [PATCH 067/179] performance --- .../java/org/modelingvalue/dclare/Logic.java | 54 +++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 2 + 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index fba5c33b..ce48c8d6 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -53,16 +53,21 @@ public static final class CircularLogicException extends RuntimeException { @SuppressWarnings("rawtypes") private final List> derived; + @SuppressWarnings("rawtypes") + private final Pair current; @SuppressWarnings("rawtypes") private CircularLogicException(List> derived, Pair current) { - int i = derived.firstIndexOf(current); - this.derived = derived.sublist(0, i + 1).prepend(current); + this.derived = derived; + this.current = current; } + @SuppressWarnings("rawtypes") @Override public String getMessage() { - return "Cycle " + derived.reverse().asList().toString().substring(4); + int i = derived.firstIndexOf(current); + List> cycle = derived.sublist(0, i + 1).prepend(current); + return "Cycle " + cycle.reverse().asList().toString().substring(4); } } @@ -107,17 +112,7 @@ protected final S bind(S in) { if (!empty.isEmpty()) { Set set = extend.get(copy(pat)); if (!set.isEmpty()) { - Set em = empty; - throw new UnboundVariableException(empty, set.map(s -> { - Map vs = vars; - for (int i = 0; i < in.length(); i++) { - Object vin = in.get(i); - if (em.contains(vin)) { - vs = vs.put(vin, s.get(i)); - } - } - return vs; - }).asSet()); + throw new UnboundVariableException(empty, set, in); } } return copy(out); @@ -406,14 +401,29 @@ private static boolean and(List predicates) { private static final Context> VARIABLES = Context.of(Map.of()); public static final class UnboundVariableException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; + private static final long serialVersionUID = 4505117271488648346L; - private final Set vars; - private final Set> bindings; + private final Set empty; + private final Set set; + private final Struct in; - private UnboundVariableException(Set vars, Set> bindings) { - this.vars = vars; - this.bindings = bindings; + private UnboundVariableException(Set empty, Set set, Struct in) { + this.empty = empty; + this.set = set; + this.in = in; + } + + private Set> bindings(Map vars) { + return set.map(s -> { + Map vs = vars; + for (int i = 0; i < s.length(); i++) { + Object vin = in.get(i); + if (empty.contains(vin)) { + vs = vs.put(vin, s.get(i)); + } + } + return vs; + }).asSet(); } } @@ -436,8 +446,8 @@ private static boolean doUni(Map vars, Supplier predica try { return VARIABLES.get(vars, predicate); } catch (UnboundVariableException uve) { - if (uve.vars.anyMatch(vars::containsKey)) { - return any(uve.bindings.map(vs -> () -> doUni(vs, predicate))).getAsBoolean(); + if (uve.empty.anyMatch(vars::containsKey)) { + return any(uve.bindings(vars).map(vs -> () -> doUni(vs, predicate))).getAsBoolean(); } else { throw uve; } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 5632baa1..716e106e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -72,6 +72,7 @@ public void test1() { isFalse(PARENT.is("Marijn", "Wim")); isFalse(PARENT.is("Heleeen", "Wim")); + isFalse(PARENT.is("Wim", "Wim")); isTrue(ANCESTOR.is("Carel", "Marijn")); isTrue(ANCESTOR.is("Wim", "Marijn")); @@ -79,6 +80,7 @@ public void test1() { isFalse(ANCESTOR.is("Marijn", "Wim")); isFalse(ANCESTOR.is("Heleeen", "Wim")); isFalse(ANCESTOR.is("Joppe", "Carel")); + isFalse(ANCESTOR.is("Carel", "Carel")); }); } } From 5e52b7fb99e1bfc77899f878711347a8b5e68480 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sun, 17 Nov 2024 16:30:17 +0100 Subject: [PATCH 068/179] refactor rules --- .../java/org/modelingvalue/dclare/Logic.java | 294 +++++++++--------- .../modelingvalue/dclare/test/LogicTest.java | 27 +- 2 files changed, 169 insertions(+), 152 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index ce48c8d6..8035afb0 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiPredicate; -import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; @@ -33,6 +32,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.Struct; +import org.modelingvalue.collections.struct.impl.StructImpl; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.QuadPredicate; @@ -71,6 +71,14 @@ public String getMessage() { } } + public static final class Relation extends StructImpl { + private static final long serialVersionUID = -3477936037166526320L; + + public Relation(Object... data) { + super(data); + } + } + public static abstract class Functor { private final Constant> extend; @@ -93,31 +101,28 @@ protected final Function derive(Function f) { protected final S bind(S in) { Map vars = VARIABLES.get(); - if (!vars.isEmpty()) { - Object[] pat = in.toArray(); - Object[] out = in.toArray(); - Set empty = Set.of(); - for (int i = 0; i < in.length(); i++) { - Object vin = in.get(i); - if (vars.containsKey(vin)) { - Object vout = vars.get(vin); - if (vout == null) { - pat[i] = null; - empty = empty.add(vin); - } else { - out[i] = vout; - } + Object[] pat = in.toArray(); + Object[] out = in.toArray(); + Set empty = Set.of(); + for (int i = 0; i < in.length(); i++) { + Object vin = in.get(i); + if (vars.containsKey(vin)) { + Object vout = vars.get(vin); + pat[i] = vout; + if (vout == null) { + empty = empty.add(vin); + } else { + out[i] = vout; } } - if (!empty.isEmpty()) { - Set set = extend.get(copy(pat)); - if (!set.isEmpty()) { - throw new UnboundVariableException(empty, set, in); - } + } + if (!empty.isEmpty()) { + Set set = extend.get(copy(pat)); + if (!set.isEmpty()) { + throw new UnboundVariableException(empty, set, in); } - return copy(out); } - return in; + return copy(out); } @SuppressWarnings("rawtypes") @@ -146,57 +151,47 @@ private void extend(int i, S in, Object[] array) { protected abstract S copy(Object[] array); }; - // Relations - - public static final Rel1 rel1(Object id, // - java.util.function.Function p) { - return new Rel1(id, (o) -> p.apply(o).getAsBoolean()); + private static boolean run(Map vars, Supplier predicate) { + return VARIABLES.get(VARIABLES.get().putAll(vars), predicate); } - public static final Rel1 rel1(Object id) { - return new Rel1(id, null); - } + // Relations - public static final Rel2 rel2(Object id, // - java.util.function.BiFunction p) { - return new Rel2(id, (o1, o2) -> p.apply(o1, o2).getAsBoolean()); + public static final Rel1 rel1(Object id) { + return new Rel1(id); } public static final Rel2 rel2(Object id) { - return new Rel2(id, null); - } - - public static final Rel3 rel3(Object id, // - org.modelingvalue.collections.util.TriFunction p) { - return new Rel3(id, (o1, o2, o3) -> p.apply(o1, o2, o3).getAsBoolean()); + return new Rel2(id); } public static final Rel3 rel3(Object id) { - return new Rel3(id, null); - } - - public static final Rel4 rel4(Object id, // - org.modelingvalue.collections.util.QuadFunction p) { - return new Rel4(id, (o1, o2, o3, o4) -> p.apply(o1, o2, o3, o4).getAsBoolean()); + return new Rel3(id); } public static final Rel4 rel4(Object id) { - return new Rel4(id, null); + return new Rel4(id); } public static final class Rel1 extends Functor> { private final Constant, Boolean> constant; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; - private Rel1(Object id, Predicate p) { + private Rel1(Object id) { super(id); - constant = Constant., Boolean> of(id, p != null ? null : false, // - p == null ? null : derive(o -> p.test(o.a())), // - (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); + constant = Constant., Boolean> of(id, false, // + (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); + } + + public void rule(O v1, Supplier p) { + rules = rules.add(o -> run(Map.of(Entry.of(v1, o)), p)); + deriver = s -> any(rules.map(r -> () -> r.test(s.a()))).get(); } @SuppressWarnings("unchecked") - public BooleanSupplier is(O o) { - return () -> constant.get(bind(Single.of(o))); + public Supplier is(O o) { + return () -> constant.get(bind(Single.of(o)), deriver); } public void fact(O o) { @@ -217,17 +212,23 @@ protected Single copy(Object[] array) { public static final class Rel2 extends Functor> { private final Constant, Boolean> constant; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; - private Rel2(Object id, BiPredicate p) { + private Rel2(Object id) { super(id); - constant = Constant., Boolean> of(id, p != null ? null : false, // - p == null ? null : derive(o -> p.test(o.a(), o.b())), // - (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); + constant = Constant., Boolean> of(id, false, // + (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); + } + + public void rule(O1 v1, O2 v2, Supplier p) { + rules = rules.add((o1, o2) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2)), p)); + deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b()))).get(); } @SuppressWarnings("unchecked") - public BooleanSupplier is(O1 o1, O2 o2) { - return () -> constant.get(bind(Pair.of(o1, o2))); + public Supplier is(O1 o1, O2 o2) { + return () -> constant.get(bind(Pair.of(o1, o2)), deriver); } public void fact(O1 o1, O2 o2) { @@ -248,17 +249,23 @@ protected Pair copy(Object[] array) { public static final class Rel3 extends Functor> { private final Constant, Boolean> constant; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; - private Rel3(Object id, TriPredicate p) { + private Rel3(Object id) { super(id); - constant = Constant., Boolean> of(id, p != null ? null : false, // - p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c())), // - (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); + constant = Constant., Boolean> of(id, false, // + (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); + } + + public void rule(O1 v1, O2 v2, O3 v3, Supplier p) { + rules = rules.add((o1, o2, o3) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2), Entry.of(v3, o3)), p)); + deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b(), s.c()))).get(); } @SuppressWarnings("unchecked") - public BooleanSupplier is(O1 o1, O2 o2, O3 o3) { - return () -> constant.get(bind(Triple.of(o1, o2, o3))); + public Supplier is(O1 o1, O2 o2, O3 o3) { + return () -> constant.get(bind(Triple.of(o1, o2, o3)), deriver); } public void fact(O1 o1, O2 o2, O3 o3) { @@ -279,17 +286,23 @@ protected Triple copy(Object[] array) { public static final class Rel4 extends Functor> { private final Constant, Boolean> constant; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; - private Rel4(Object id, QuadPredicate p) { + private Rel4(Object id) { super(id); - constant = Constant., Boolean> of(id, p != null ? null : false, // - p == null ? null : derive(o -> p.test(o.a(), o.b(), o.c(), o.d())), // - (tx, o, b, t) -> extend(o, t, p != null), CoreSetableModifier.durable); + constant = Constant., Boolean> of(id, false, // + (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); + } + + public void rule(O1 v1, O2 v2, O3 v3, O4 v4, Supplier p) { + rules = rules.add((o1, o2, o3, o4) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2), Entry.of(v3, o3), Entry.of(v4, o4)), p)); + deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b(), s.c(), s.d()))).get(); } @SuppressWarnings("unchecked") - public BooleanSupplier is(O1 o1, O2 o2, O3 o3, O4 o4) { - return () -> constant.get(bind(Quadruple.of(o1, o2, o3, o4))); + public Supplier is(O1 o1, O2 o2, O3 o3, O4 o4) { + return () -> constant.get(bind(Quadruple.of(o1, o2, o3, o4)), deriver); } public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { @@ -310,89 +323,81 @@ protected Quadruple copy(Object[] array) { // Not - public static final BooleanSupplier not(BooleanSupplier predicate) { - return () -> !predicate.getAsBoolean(); + public static final Supplier not(Supplier predicate) { + return () -> !predicate.get(); } // Or @SafeVarargs - public static final BooleanSupplier or(BooleanSupplier... predicates) { - return () -> or(List.of(predicates)); + public static final Supplier or(Supplier... predicates) { + List> list = List.of(predicates); + return list.isEmpty() ? () -> false : list.size() == 1 ? list.get(0) : () -> or(list); } - public static final BooleanSupplier any(Collection predicates) { - return () -> or(predicates.asList()); + public static final Supplier any(Collection> predicates) { + List> list = predicates.asList(); + return list.isEmpty() ? () -> false : list.size() == 1 ? list.get(0) : () -> or(list); } - private static boolean or(List predicates) { - if (predicates.isEmpty()) { - return false; - } else if (predicates.size() == 1) { - return predicates.first().getAsBoolean(); - } else { - List or = predicates.random().asList(); - AtomicReference ref = new AtomicReference<>(null); - boolean result = or.anyMatch(p -> { - try { - return p.getAsBoolean(); - } catch (UnboundVariableException uve) { - ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); - return true; - } catch (CircularLogicException cle) { - ref.updateAndGet(rte -> rte == null ? cle : rte); - return false; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof UnboundVariableException) { - throw exc; - } else if (!result && exc != null) { - throw exc; - } else { - return result; + private static boolean or(List> predicates) { + List> or = predicates.random().asList(); + AtomicReference ref = new AtomicReference<>(null); + boolean result = or.anyMatch(p -> { + try { + return p.get(); + } catch (UnboundVariableException uve) { + ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); + return true; + } catch (CircularLogicException cle) { + ref.updateAndGet(rte -> rte == null ? cle : rte); + return false; } + }); + RuntimeException exc = ref.get(); + if (exc instanceof UnboundVariableException) { + throw exc; + } else if (!result && exc != null) { + throw exc; + } else { + return result; } } // And @SafeVarargs - public static final BooleanSupplier and(BooleanSupplier... predicates) { - return () -> and(List.of(predicates)); + public static final Supplier and(Supplier... predicates) { + List> list = List.of(predicates); + return list.isEmpty() ? () -> true : list.size() == 1 ? list.get(0) : () -> and(list); } - public static final BooleanSupplier all(Collection predicates) { - return () -> and(predicates.asList()); + public static final Supplier all(Collection> predicates) { + List> list = predicates.asList(); + return list.isEmpty() ? () -> true : list.size() == 1 ? list.get(0) : () -> and(list); } - private static boolean and(List predicates) { - if (predicates.isEmpty()) { - return true; - } else if (predicates.size() == 1) { - return predicates.first().getAsBoolean(); - } else { - List and = predicates.random().asList(); - AtomicReference ref = new AtomicReference<>(null); - boolean result = and.allMatch(p -> { - try { - return p.getAsBoolean(); - } catch (UnboundVariableException uve) { - ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); - return false; - } catch (CircularLogicException cle) { - ref.updateAndGet(rte -> rte == null ? cle : rte); - return true; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof UnboundVariableException) { - throw exc; - } else if (result && exc != null) { - throw exc; - } else { - return result; + private static boolean and(List> predicates) { + List> and = predicates.random().asList(); + AtomicReference ref = new AtomicReference<>(null); + boolean result = and.allMatch(p -> { + try { + return p.get(); + } catch (UnboundVariableException uve) { + ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); + return false; + } catch (CircularLogicException cle) { + ref.updateAndGet(rte -> rte == null ? cle : rte); + return true; } + }); + RuntimeException exc = ref.get(); + if (exc instanceof UnboundVariableException) { + throw exc; + } else if (result && exc != null) { + throw exc; + } else { + return result; } } @@ -428,26 +433,35 @@ private Set> bindings(Map vars) { } @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(V1 v1, BooleanSupplier predicate) { - return () -> doUni(Collection.of(v1).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); + public static final Supplier uni(V1 v1, Supplier predicate) { + Map vars = Map.of(Entry.of(v1, null)); + return () -> doUni(vars, predicate); + } + + @SuppressWarnings("unchecked") + public static final Supplier uni(V1 v1, V2 v2, Supplier predicate) { + Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null)); + return () -> doUni(vars, predicate); } @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(V1 v1, V2 v2, BooleanSupplier predicate) { - return () -> doUni(Collection.of(v1, v2).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); + public static final Supplier uni(V1 v1, V2 v2, V3 v3, Supplier predicate) { + Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null), Entry.of(v3, null)); + return () -> doUni(vars, predicate); } @SuppressWarnings("unchecked") - public static final BooleanSupplier uni(V1 v1, V2 v2, V3 v3, BooleanSupplier predicate) { - return () -> doUni(Collection.of(v1, v2, v3).asMap(o -> Entry.of(o, null)), () -> predicate.getAsBoolean()); + public static final Supplier uni(V1 v1, V2 v2, V3 v3, V4 v4, Supplier predicate) { + Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null), Entry.of(v3, null), Entry.of(v4, null)); + return () -> doUni(vars, predicate); } private static boolean doUni(Map vars, Supplier predicate) { try { - return VARIABLES.get(vars, predicate); + return run(vars, predicate); } catch (UnboundVariableException uve) { if (uve.empty.anyMatch(vars::containsKey)) { - return any(uve.bindings(vars).map(vs -> () -> doUni(vs, predicate))).getAsBoolean(); + return any(uve.bindings(vars).map(vs -> () -> doUni(vs, predicate))).get(); } else { throw uve; } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 716e106e..f76731d0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -24,7 +24,7 @@ import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; -import java.util.function.BooleanSupplier; +import java.util.function.Supplier; import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.dclare.Logic.Rel2; @@ -40,21 +40,24 @@ void run(Runnable test) { universeTransaction.waitForEnd(); } - static void isTrue(BooleanSupplier bs) { - assertTrue(bs.getAsBoolean()); + static void isTrue(Supplier bs) { + assertTrue(bs.get()); } - static void isFalse(BooleanSupplier bs) { - assertTrue(!bs.getAsBoolean()); + static void isFalse(Supplier bs) { + assertTrue(!bs.get()); } - static final String X = "$X"; - static final Rel2 PARENT = rel2("parent"); - - static final Rel2 ANCESTOR = rel2("ancestor", // - (a, o) -> or(PARENT.is(a, o), // - uni(X, and(LogicTest.ANCESTOR.is(a, X), PARENT.is(X, o))))); + static final Rel2 ANCESTOR = rel2("ancestor"); + + static final String A = "A"; // Ancestor + static final String O = "O"; // Offspring + static final String R = "R"; // Relative + static { + ANCESTOR.rule(A, O, PARENT.is(A, O)); // + ANCESTOR.rule(A, O, uni(R, and(ANCESTOR.is(A, R), PARENT.is(R, O)))); + } @RepeatedTest(512) public void test1() { @@ -74,8 +77,8 @@ public void test1() { isFalse(PARENT.is("Heleeen", "Wim")); isFalse(PARENT.is("Wim", "Wim")); - isTrue(ANCESTOR.is("Carel", "Marijn")); isTrue(ANCESTOR.is("Wim", "Marijn")); + isTrue(ANCESTOR.is("Carel", "Marijn")); isFalse(ANCESTOR.is("Marijn", "Wim")); isFalse(ANCESTOR.is("Heleeen", "Wim")); From 6727c84f7a8eca504f0090c9c4fba1734b82d566 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sun, 17 Nov 2024 16:38:13 +0100 Subject: [PATCH 069/179] bind based on array --- .../java/org/modelingvalue/dclare/Logic.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 8035afb0..60f89741 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -99,13 +99,13 @@ protected final Function derive(Function f) { }; } - protected final S bind(S in) { + protected final S bind(Object... in) { Map vars = VARIABLES.get(); - Object[] pat = in.toArray(); - Object[] out = in.toArray(); + Object[] pat = in.clone(); + Object[] out = in.clone(); Set empty = Set.of(); - for (int i = 0; i < in.length(); i++) { - Object vin = in.get(i); + for (int i = 0; i < in.length; i++) { + Object vin = in[i]; if (vars.containsKey(vin)) { Object vout = vars.get(vin); pat[i] = vout; @@ -117,12 +117,12 @@ protected final S bind(S in) { } } if (!empty.isEmpty()) { - Set set = extend.get(copy(pat)); + Set set = extend.get(struct(pat)); if (!set.isEmpty()) { throw new UnboundVariableException(empty, set, in); } } - return copy(out); + return struct(out); } @SuppressWarnings("rawtypes") @@ -137,18 +137,18 @@ private void extend(int i, S in, Object[] array) { array = array.clone(); if (array[i] == null) { array[i] = in.get(i); - extend.force(copy(array), Set::add, in); + extend.force(struct(array), Set::add, in); } extend(i + 1, in, array); if (array[i] != null) { array[i] = null; - extend.force(copy(array), Set::add, in); + extend.force(struct(array), Set::add, in); } extend(i + 1, in, array); } } - protected abstract S copy(Object[] array); + protected abstract S struct(Object[] array); }; private static boolean run(Map vars, Supplier predicate) { @@ -191,7 +191,7 @@ public void rule(O v1, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O o) { - return () -> constant.get(bind(Single.of(o)), deriver); + return () -> constant.get(bind(o), deriver); } public void fact(O o) { @@ -205,7 +205,7 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected Single copy(Object[] array) { + protected Single struct(Object[] array) { return Single.of((O) array[0]); } } @@ -228,7 +228,7 @@ public void rule(O1 v1, O2 v2, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2) { - return () -> constant.get(bind(Pair.of(o1, o2)), deriver); + return () -> constant.get(bind(o1, o2), deriver); } public void fact(O1 o1, O2 o2) { @@ -242,7 +242,7 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected Pair copy(Object[] array) { + protected Pair struct(Object[] array) { return Pair.of((O1) array[0], (O2) array[1]); } } @@ -265,7 +265,7 @@ public void rule(O1 v1, O2 v2, O3 v3, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2, O3 o3) { - return () -> constant.get(bind(Triple.of(o1, o2, o3)), deriver); + return () -> constant.get(bind(o1, o2, o3), deriver); } public void fact(O1 o1, O2 o2, O3 o3) { @@ -279,7 +279,7 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected Triple copy(Object[] array) { + protected Triple struct(Object[] array) { return Triple.of((O1) array[0], (O2) array[1], (O3) array[2]); } } @@ -302,7 +302,7 @@ public void rule(O1 v1, O2 v2, O3 v3, O4 v4, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2, O3 o3, O4 o4) { - return () -> constant.get(bind(Quadruple.of(o1, o2, o3, o4)), deriver); + return () -> constant.get(bind(o1, o2, o3, o4), deriver); } public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { @@ -316,7 +316,7 @@ public String toString() { @SuppressWarnings("unchecked") @Override - protected Quadruple copy(Object[] array) { + protected Quadruple struct(Object[] array) { return Quadruple.of((O1) array[0], (O2) array[1], (O3) array[2], (O4) array[3]); } } @@ -410,9 +410,9 @@ public static final class UnboundVariableException extends RuntimeException { private final Set empty; private final Set set; - private final Struct in; + private final Object[] in; - private UnboundVariableException(Set empty, Set set, Struct in) { + private UnboundVariableException(Set empty, Set set, Object[] in) { this.empty = empty; this.set = set; this.in = in; @@ -422,7 +422,7 @@ private Set> bindings(Map vars) { return set.map(s -> { Map vs = vars; for (int i = 0; i < s.length(); i++) { - Object vin = in.get(i); + Object vin = in[i]; if (empty.contains(vin)) { vs = vs.put(vin, s.get(i)); } From 0a48f68addc8cc7c44bc891411663f8b00ae6001 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 10:54:15 +0100 Subject: [PATCH 070/179] Working Logic --- .../java/org/modelingvalue/dclare/Logic.java | 219 +++++++++--------- .../modelingvalue/dclare/test/LogicTest.java | 14 +- 2 files changed, 120 insertions(+), 113 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 60f89741..1e5d2fca 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -83,76 +83,95 @@ public static abstract class Functor { private final Constant> extend; protected Functor(Object id) { - extend = Constant.> of(Single.of(id), Set.of(), CoreSetableModifier.durable); + extend = Constant.> of(id, Set.of(), CoreSetableModifier.durable); } - @SuppressWarnings("rawtypes") - protected final Function derive(Function f) { - return o -> { - Pair slot = Pair.of(this, o); - List> pre = DERIVED.get(); - if (pre.contains(slot)) { - throw new CircularLogicException(pre, slot); - } else { - return DERIVED.get(pre.prepend(slot), () -> f.apply(o)); - } - }; + @Override + public String toString() { + return extend.toString(); } - protected final S bind(Object... in) { + @SuppressWarnings("rawtypes") + protected final Boolean get(Function deriver, Object... in) { + Set empty = deriver == null ? Set.of() : null; Map vars = VARIABLES.get(); - Object[] pat = in.clone(); Object[] out = in.clone(); - Set empty = Set.of(); for (int i = 0; i < in.length; i++) { - Object vin = in[i]; - if (vars.containsKey(vin)) { - Object vout = vars.get(vin); - pat[i] = vout; - if (vout == null) { - empty = empty.add(vin); + while (vars.containsKey(in[i])) { + Object v = vars.get(in[i]); + if (v == null) { + if (deriver == null) { + empty = empty.add(out[i]); + out[i] = null; + } + break; } else { - out[i] = vout; + out[i] = v; + in[i] = v; } } } - if (!empty.isEmpty()) { - Set set = extend.get(struct(pat)); - if (!set.isEmpty()) { + S s = struct(out); + Pair slot = Pair.of(this, s); + List> pre = DERIVED.get(); + if (deriver != null) { + System.err.println(" ".repeat(pre.size()) + slot); + if (pre.contains(slot)) { + throw new CircularLogicException(pre, slot); + } else { + return DERIVED.get(pre.prepend(slot), () -> deriver.apply(s)); + } + } else { + Set set = extend.get(s); + System.err.println(" ".repeat(pre.size()) + slot + " " + set); + if (set.isEmpty()) { + return false; + } else if (!empty.isEmpty()) { throw new UnboundVariableException(empty, set, in); + } else { + return true; } } - return struct(out); } @SuppressWarnings("rawtypes") - protected final void extend(S in, Boolean res, boolean der) { - if (res && !der) { - extend(0, in, in.toArray()); + protected final void set(S in, Boolean res, Function deriver) { + if (res && deriver == null) { + extend.force(in, Set::add, in); + set(0, in, in.toArray()); } } - private void extend(int i, S in, Object[] array) { + private void set(int i, S in, Object[] array) { if (i < array.length) { array = array.clone(); if (array[i] == null) { array[i] = in.get(i); extend.force(struct(array), Set::add, in); } - extend(i + 1, in, array); + set(i + 1, in, array); if (array[i] != null) { array[i] = null; extend.force(struct(array), Set::add, in); } - extend(i + 1, in, array); + set(i + 1, in, array); } } protected abstract S struct(Object[] array); }; + @SuppressWarnings("rawtypes") private static boolean run(Map vars, Supplier predicate) { - return VARIABLES.get(VARIABLES.get().putAll(vars), predicate); + Map pre = VARIABLES.get(); + List> der = DERIVED.get(); + if (vars.filter(kv -> kv.getValue() == null).anyMatch(kv -> pre.containsKey(kv.getKey()) && pre.get(kv.getKey()) == null)) { + throw new CircularLogicException(der, der.first()); + } else { + Map all = pre.putAll(vars); + System.err.println(" ".repeat(der.size() * 2 - 1) + all); + return VARIABLES.get(all, predicate); + } } // Relations @@ -173,52 +192,41 @@ public static final Rel4 rel4(Object id) { return new Rel4(id); } - public static final class Rel1 extends Functor> { - private final Constant, Boolean> constant; - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; + public static final class Rel1 extends Functor> { + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; private Rel1(Object id) { super(id); - constant = Constant., Boolean> of(id, false, // - (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); } - public void rule(O v1, Supplier p) { - rules = rules.add(o -> run(Map.of(Entry.of(v1, o)), p)); + public void rule(O1 v1, Supplier p) { + rules = rules.add(o1 -> run(Map.of(Entry.of(v1, o1)), p)); deriver = s -> any(rules.map(r -> () -> r.test(s.a()))).get(); } @SuppressWarnings("unchecked") - public Supplier is(O o) { - return () -> constant.get(bind(o), deriver); - } - - public void fact(O o) { - constant.set(Single.of(o), true); + public Supplier is(O1 o1) { + return () -> get(deriver, o1); } - @Override - public String toString() { - return constant.toString(); + public void fact(O1 o1) { + set(Single.of(o1), true, deriver); } @SuppressWarnings("unchecked") @Override - protected Single struct(Object[] array) { - return Single.of((O) array[0]); + protected Single struct(Object[] array) { + return Single.of((O1) array[0]); } } public static final class Rel2 extends Functor> { - private final Constant, Boolean> constant; - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; private Rel2(Object id) { super(id); - constant = Constant., Boolean> of(id, false, // - (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); } public void rule(O1 v1, O2 v2, Supplier p) { @@ -228,16 +236,11 @@ public void rule(O1 v1, O2 v2, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2) { - return () -> constant.get(bind(o1, o2), deriver); + return () -> get(deriver, o1, o2); } public void fact(O1 o1, O2 o2) { - constant.set(Pair.of(o1, o2), true); - } - - @Override - public String toString() { - return constant.toString(); + set(Pair.of(o1, o2), true, deriver); } @SuppressWarnings("unchecked") @@ -248,14 +251,11 @@ protected Pair struct(Object[] array) { } public static final class Rel3 extends Functor> { - private final Constant, Boolean> constant; - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; private Rel3(Object id) { super(id); - constant = Constant., Boolean> of(id, false, // - (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); } public void rule(O1 v1, O2 v2, O3 v3, Supplier p) { @@ -265,16 +265,11 @@ public void rule(O1 v1, O2 v2, O3 v3, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2, O3 o3) { - return () -> constant.get(bind(o1, o2, o3), deriver); + return () -> get(deriver, o1, o2, o3); } public void fact(O1 o1, O2 o2, O3 o3) { - constant.set(Triple.of(o1, o2, o3), true); - } - - @Override - public String toString() { - return constant.toString(); + set(Triple.of(o1, o2, o3), true, deriver); } @SuppressWarnings("unchecked") @@ -285,14 +280,11 @@ protected Triple struct(Object[] array) { } public static final class Rel4 extends Functor> { - private final Constant, Boolean> constant; - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; + private Set> rules = Set.of(); + private Function, Boolean> deriver = null; private Rel4(Object id) { super(id); - constant = Constant., Boolean> of(id, false, // - (tx, o, b, t) -> extend(o, t, deriver != null), CoreSetableModifier.durable); } public void rule(O1 v1, O2 v2, O3 v3, O4 v4, Supplier p) { @@ -302,16 +294,11 @@ public void rule(O1 v1, O2 v2, O3 v3, O4 v4, Supplier p) { @SuppressWarnings("unchecked") public Supplier is(O1 o1, O2 o2, O3 o3, O4 o4) { - return () -> constant.get(bind(o1, o2, o3, o4), deriver); + return () -> get(deriver, o1, o2, o3, o4); } public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { - constant.set(Quadruple.of(o1, o2, o3, o4), true); - } - - @Override - public String toString() { - return constant.toString(); + set(Quadruple.of(o1, o2, o3, o4), true, deriver); } @SuppressWarnings("unchecked") @@ -347,8 +334,14 @@ private static boolean or(List> predicates) { try { return p.get(); } catch (UnboundVariableException uve) { - ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); - return true; + ref.updateAndGet(rte -> { + if (rte instanceof UnboundVariableException) { + return ((UnboundVariableException) rte).merge(uve); + } else { + return rte == null || rte instanceof CircularLogicException ? uve : rte; + } + }); + return false; } catch (CircularLogicException cle) { ref.updateAndGet(rte -> rte == null ? cle : rte); return false; @@ -384,8 +377,14 @@ private static boolean and(List> predicates) { try { return p.get(); } catch (UnboundVariableException uve) { - ref.updateAndGet(rte -> rte == null || rte instanceof CircularLogicException ? uve : rte); - return false; + ref.updateAndGet(rte -> { + if (rte instanceof UnboundVariableException) { + return ((UnboundVariableException) rte).merge(uve); + } else { + return rte == null || rte instanceof CircularLogicException ? uve : rte; + } + }); + return true; } catch (CircularLogicException cle) { ref.updateAndGet(rte -> rte == null ? cle : rte); return true; @@ -406,30 +405,30 @@ private static boolean and(List> predicates) { private static final Context> VARIABLES = Context.of(Map.of()); public static final class UnboundVariableException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; + private static final long serialVersionUID = 4505117271488648346L; - private final Set empty; - private final Set set; - private final Object[] in; + private final Set> bindings; private UnboundVariableException(Set empty, Set set, Object[] in) { - this.empty = empty; - this.set = set; - this.in = in; - } - - private Set> bindings(Map vars) { - return set.map(s -> { - Map vs = vars; - for (int i = 0; i < s.length(); i++) { + this.bindings = set.map(b -> { + Map vars = Map.of(); + for (int i = 0; i < b.length(); i++) { Object vin = in[i]; if (empty.contains(vin)) { - vs = vs.put(vin, s.get(i)); + vars = vars.put(vin, b.get(i)); } } - return vs; + return vars; }).asSet(); } + + private UnboundVariableException(Set> bindings) { + this.bindings = bindings; + } + + private UnboundVariableException merge(UnboundVariableException other) { + return new UnboundVariableException(bindings.addAll(other.bindings)); + } } @SuppressWarnings("unchecked") @@ -460,11 +459,7 @@ private static boolean doUni(Map vars, Supplier predica try { return run(vars, predicate); } catch (UnboundVariableException uve) { - if (uve.empty.anyMatch(vars::containsKey)) { - return any(uve.bindings(vars).map(vs -> () -> doUni(vs, predicate))).get(); - } else { - throw uve; - } + return any(uve.bindings.map(vs -> () -> doUni(vars.putAll(vs), predicate))).get(); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index f76731d0..4df40d6b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -27,6 +27,7 @@ import java.util.function.Supplier; import org.junit.jupiter.api.RepeatedTest; +import org.modelingvalue.collections.Collection; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -35,7 +36,7 @@ public class LogicTest { void run(Runnable test) { UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); - universeTransaction.put("test", test); + universeTransaction.put("test", Collection.sequential(test)); universeTransaction.stop(); universeTransaction.waitForEnd(); } @@ -61,6 +62,17 @@ static void isFalse(Supplier bs) { @RepeatedTest(512) public void test1() { + run(() -> { + PARENT.fact("Carel", "Jan"); + PARENT.fact("Jan", "Wim"); + PARENT.fact("Wim", "Joppe"); + + isTrue(ANCESTOR.is("Carel", "Joppe")); + }); + } + + @RepeatedTest(512) + public void test2() { run(() -> { PARENT.fact("Carel", "Jan"); PARENT.fact("Jan", "Wim"); From fc61f032cb62c76a0dc8f30dcf5a94c77e3ed78e Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 11:07:35 +0100 Subject: [PATCH 071/179] remove tracing --- src/main/java/org/modelingvalue/dclare/Logic.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 1e5d2fca..4a9d97c6 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -112,10 +112,10 @@ protected final Boolean get(Function deriver, Object... in) { } } S s = struct(out); - Pair slot = Pair.of(this, s); - List> pre = DERIVED.get(); + if (deriver != null) { - System.err.println(" ".repeat(pre.size()) + slot); + Pair slot = Pair.of(this, s); + List> pre = DERIVED.get(); if (pre.contains(slot)) { throw new CircularLogicException(pre, slot); } else { @@ -123,7 +123,6 @@ protected final Boolean get(Function deriver, Object... in) { } } else { Set set = extend.get(s); - System.err.println(" ".repeat(pre.size()) + slot + " " + set); if (set.isEmpty()) { return false; } else if (!empty.isEmpty()) { @@ -164,13 +163,11 @@ private void set(int i, S in, Object[] array) { @SuppressWarnings("rawtypes") private static boolean run(Map vars, Supplier predicate) { Map pre = VARIABLES.get(); - List> der = DERIVED.get(); if (vars.filter(kv -> kv.getValue() == null).anyMatch(kv -> pre.containsKey(kv.getKey()) && pre.get(kv.getKey()) == null)) { + List> der = DERIVED.get(); throw new CircularLogicException(der, der.first()); } else { - Map all = pre.putAll(vars); - System.err.println(" ".repeat(der.size() * 2 - 1) + all); - return VARIABLES.get(all, predicate); + return VARIABLES.get(pre.putAll(vars), predicate); } } From 10ed57957af3250dfac2ceaebaaaf524b7c85e5f Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 11:10:41 +0100 Subject: [PATCH 072/179] less annotations --- src/main/java/org/modelingvalue/dclare/Logic.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 4a9d97c6..3a24d0af 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -48,21 +48,18 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Context>> DERIVED = Context.of(List.of()); + @SuppressWarnings("rawtypes") public static final class CircularLogicException extends RuntimeException { private static final long serialVersionUID = 293433487448006753L; - @SuppressWarnings("rawtypes") private final List> derived; - @SuppressWarnings("rawtypes") private final Pair current; - @SuppressWarnings("rawtypes") private CircularLogicException(List> derived, Pair current) { this.derived = derived; this.current = current; } - @SuppressWarnings("rawtypes") @Override public String getMessage() { int i = derived.firstIndexOf(current); From cabd9d09189ebceb6325e9e88782c78fcef6d0a2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 11:30:48 +0100 Subject: [PATCH 073/179] parallel --- .../java/org/modelingvalue/dclare/Logic.java | 135 ++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 3 +- 2 files changed, 77 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 3a24d0af..25774cdd 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -48,26 +48,6 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Context>> DERIVED = Context.of(List.of()); - @SuppressWarnings("rawtypes") - public static final class CircularLogicException extends RuntimeException { - private static final long serialVersionUID = 293433487448006753L; - - private final List> derived; - private final Pair current; - - private CircularLogicException(List> derived, Pair current) { - this.derived = derived; - this.current = current; - } - - @Override - public String getMessage() { - int i = derived.firstIndexOf(current); - List> cycle = derived.sublist(0, i + 1).prepend(current); - return "Cycle " + cycle.reverse().asList().toString().substring(4); - } - } - public static final class Relation extends StructImpl { private static final long serialVersionUID = -3477936037166526320L; @@ -109,7 +89,6 @@ protected final Boolean get(Function deriver, Object... in) { } } S s = struct(out); - if (deriver != null) { Pair slot = Pair.of(this, s); List> pre = DERIVED.get(); @@ -123,7 +102,17 @@ protected final Boolean get(Function deriver, Object... in) { if (set.isEmpty()) { return false; } else if (!empty.isEmpty()) { - throw new UnboundVariableException(empty, set, in); + Set em = empty; + throw new UnboundVariableException(set.map(b -> { + Map vs = Map.of(); + for (int i = 0; i < b.length(); i++) { + Object vin = in[i]; + if (em.contains(vin)) { + vs = vs.put(vin, b.get(i)); + } + } + return vs; + }).asSet()); } else { return true; } @@ -160,11 +149,11 @@ private void set(int i, S in, Object[] array) { @SuppressWarnings("rawtypes") private static boolean run(Map vars, Supplier predicate) { Map pre = VARIABLES.get(); - if (vars.filter(kv -> kv.getValue() == null).anyMatch(kv -> pre.containsKey(kv.getKey()) && pre.get(kv.getKey()) == null)) { - List> der = DERIVED.get(); - throw new CircularLogicException(der, der.first()); - } else { + Set cycle = vars.filter(kv -> kv.getValue() == null).map(Entry::getKey).filter(k -> pre.containsKey(k) && pre.get(k) == null).asSet(); + if (cycle.isEmpty()) { return VARIABLES.get(pre.putAll(vars), predicate); + } else { + throw new CircularBindingException(cycle); } } @@ -332,12 +321,12 @@ private static boolean or(List> predicates) { if (rte instanceof UnboundVariableException) { return ((UnboundVariableException) rte).merge(uve); } else { - return rte == null || rte instanceof CircularLogicException ? uve : rte; + return rte == null || rte instanceof CycleExcpetion ? uve : rte; } }); return false; - } catch (CircularLogicException cle) { - ref.updateAndGet(rte -> rte == null ? cle : rte); + } catch (CycleExcpetion ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); return false; } }); @@ -375,12 +364,12 @@ private static boolean and(List> predicates) { if (rte instanceof UnboundVariableException) { return ((UnboundVariableException) rte).merge(uve); } else { - return rte == null || rte instanceof CircularLogicException ? uve : rte; + return rte == null || rte instanceof CycleExcpetion ? uve : rte; } }); return true; - } catch (CircularLogicException cle) { - ref.updateAndGet(rte -> rte == null ? cle : rte); + } catch (CycleExcpetion ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); return true; } }); @@ -398,33 +387,6 @@ private static boolean and(List> predicates) { private static final Context> VARIABLES = Context.of(Map.of()); - public static final class UnboundVariableException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; - - private final Set> bindings; - - private UnboundVariableException(Set empty, Set set, Object[] in) { - this.bindings = set.map(b -> { - Map vars = Map.of(); - for (int i = 0; i < b.length(); i++) { - Object vin = in[i]; - if (empty.contains(vin)) { - vars = vars.put(vin, b.get(i)); - } - } - return vars; - }).asSet(); - } - - private UnboundVariableException(Set> bindings) { - this.bindings = bindings; - } - - private UnboundVariableException merge(UnboundVariableException other) { - return new UnboundVariableException(bindings.addAll(other.bindings)); - } - } - @SuppressWarnings("unchecked") public static final Supplier uni(V1 v1, Supplier predicate) { Map vars = Map.of(Entry.of(v1, null)); @@ -457,4 +419,59 @@ private static boolean doUni(Map vars, Supplier predica } } + // Runtime Exceptions + + public static final class UnboundVariableException extends RuntimeException { + private static final long serialVersionUID = 4505117271488648346L; + + private final Set> bindings; + + private UnboundVariableException(Set> bindings) { + this.bindings = bindings; + } + + private UnboundVariableException merge(UnboundVariableException other) { + return new UnboundVariableException(bindings.addAll(other.bindings)); + } + } + + private static abstract class CycleExcpetion extends RuntimeException { + private static final long serialVersionUID = -1561492438458671302L; + } + + public static final class CircularBindingException extends CycleExcpetion { + private static final long serialVersionUID = 1636584651815799600L; + + private final Set cycle; + + private CircularBindingException(Set cycle) { + this.cycle = cycle; + } + + @Override + public String getMessage() { + return "Cycle Variables " + cycle.toString().substring(3); + } + } + + @SuppressWarnings("rawtypes") + public static final class CircularLogicException extends CycleExcpetion { + private static final long serialVersionUID = 293433487448006753L; + + private final List> derived; + private final Pair current; + + private CircularLogicException(List> derived, Pair current) { + this.derived = derived; + this.current = current; + } + + @Override + public String getMessage() { + int i = derived.firstIndexOf(current); + List> cycle = derived.sublist(0, i + 1).prepend(current); + return "Cycle Logic " + cycle.reverse().asList().toString().substring(4); + } + } + } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 4df40d6b..65226ab3 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -27,7 +27,6 @@ import java.util.function.Supplier; import org.junit.jupiter.api.RepeatedTest; -import org.modelingvalue.collections.Collection; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -36,7 +35,7 @@ public class LogicTest { void run(Runnable test) { UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); - universeTransaction.put("test", Collection.sequential(test)); + universeTransaction.put("test", test); universeTransaction.stop(); universeTransaction.waitForEnd(); } From fa4f90ef4191a84206ee2b0737b863afd1f69eab Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 11:42:25 +0100 Subject: [PATCH 074/179] Renamings --- .../java/org/modelingvalue/dclare/Logic.java | 56 +++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 13 +---- 2 files changed, 29 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 25774cdd..238db767 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -103,7 +103,7 @@ protected final Boolean get(Function deriver, Object... in) { return false; } else if (!empty.isEmpty()) { Set em = empty; - throw new UnboundVariableException(set.map(b -> { + throw new BindingsFoundException(set.map(b -> { Map vs = Map.of(); for (int i = 0; i < b.length(); i++) { Object vin = in[i]; @@ -153,7 +153,7 @@ private static boolean run(Map vars, Supplier predicate if (cycle.isEmpty()) { return VARIABLES.get(pre.putAll(vars), predicate); } else { - throw new CircularBindingException(cycle); + throw new CircularVariableException(cycle); } } @@ -316,22 +316,22 @@ private static boolean or(List> predicates) { boolean result = or.anyMatch(p -> { try { return p.get(); - } catch (UnboundVariableException uve) { + } catch (BindingsFoundException bve) { ref.updateAndGet(rte -> { - if (rte instanceof UnboundVariableException) { - return ((UnboundVariableException) rte).merge(uve); + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); } else { - return rte == null || rte instanceof CycleExcpetion ? uve : rte; + return rte == null || rte instanceof CycleException ? bve : rte; } }); return false; - } catch (CycleExcpetion ce) { + } catch (CycleException ce) { ref.updateAndGet(rte -> rte == null ? ce : rte); return false; } }); RuntimeException exc = ref.get(); - if (exc instanceof UnboundVariableException) { + if (exc instanceof BindingsFoundException) { throw exc; } else if (!result && exc != null) { throw exc; @@ -359,22 +359,22 @@ private static boolean and(List> predicates) { boolean result = and.allMatch(p -> { try { return p.get(); - } catch (UnboundVariableException uve) { + } catch (BindingsFoundException bve) { ref.updateAndGet(rte -> { - if (rte instanceof UnboundVariableException) { - return ((UnboundVariableException) rte).merge(uve); + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); } else { - return rte == null || rte instanceof CycleExcpetion ? uve : rte; + return rte == null || rte instanceof CycleException ? bve : rte; } }); return true; - } catch (CycleExcpetion ce) { + } catch (CycleException ce) { ref.updateAndGet(rte -> rte == null ? ce : rte); return true; } }); RuntimeException exc = ref.get(); - if (exc instanceof UnboundVariableException) { + if (exc instanceof BindingsFoundException) { throw exc; } else if (result && exc != null) { throw exc; @@ -414,48 +414,48 @@ public static final Supplier uni(V1 v1, V2 v2, V3 v3, private static boolean doUni(Map vars, Supplier predicate) { try { return run(vars, predicate); - } catch (UnboundVariableException uve) { - return any(uve.bindings.map(vs -> () -> doUni(vars.putAll(vs), predicate))).get(); + } catch (BindingsFoundException bve) { + return any(bve.bindings.map(vs -> () -> doUni(vars.putAll(vs), predicate))).get(); } } // Runtime Exceptions - public static final class UnboundVariableException extends RuntimeException { + public static final class BindingsFoundException extends RuntimeException { private static final long serialVersionUID = 4505117271488648346L; private final Set> bindings; - private UnboundVariableException(Set> bindings) { + private BindingsFoundException(Set> bindings) { this.bindings = bindings; } - private UnboundVariableException merge(UnboundVariableException other) { - return new UnboundVariableException(bindings.addAll(other.bindings)); + private BindingsFoundException merge(BindingsFoundException other) { + return new BindingsFoundException(bindings.addAll(other.bindings)); } } - private static abstract class CycleExcpetion extends RuntimeException { + private static abstract class CycleException extends RuntimeException { private static final long serialVersionUID = -1561492438458671302L; } - public static final class CircularBindingException extends CycleExcpetion { + public static final class CircularVariableException extends CycleException { private static final long serialVersionUID = 1636584651815799600L; - private final Set cycle; + private final Set vars; - private CircularBindingException(Set cycle) { - this.cycle = cycle; + private CircularVariableException(Set vars) { + this.vars = vars; } @Override public String getMessage() { - return "Cycle Variables " + cycle.toString().substring(3); + return "Circular Variables " + vars.toString().substring(3); } } @SuppressWarnings("rawtypes") - public static final class CircularLogicException extends CycleExcpetion { + public static final class CircularLogicException extends CycleException { private static final long serialVersionUID = 293433487448006753L; private final List> derived; @@ -470,7 +470,7 @@ private CircularLogicException(List> derived, Pair> cycle = derived.sublist(0, i + 1).prepend(current); - return "Cycle Logic " + cycle.reverse().asList().toString().substring(4); + return "Circular Logic " + cycle.reverse().asList().toString().substring(4); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 65226ab3..ed897d3e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -59,19 +59,8 @@ static void isFalse(Supplier bs) { ANCESTOR.rule(A, O, uni(R, and(ANCESTOR.is(A, R), PARENT.is(R, O)))); } - @RepeatedTest(512) + @RepeatedTest(1024) public void test1() { - run(() -> { - PARENT.fact("Carel", "Jan"); - PARENT.fact("Jan", "Wim"); - PARENT.fact("Wim", "Joppe"); - - isTrue(ANCESTOR.is("Carel", "Joppe")); - }); - } - - @RepeatedTest(512) - public void test2() { run(() -> { PARENT.fact("Carel", "Jan"); PARENT.fact("Jan", "Wim"); From 0b5762207602a5a70d78c3d5e2f0ee00356e844c Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 12:16:55 +0100 Subject: [PATCH 075/179] derived facts --- .../java/org/modelingvalue/dclare/Logic.java | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 238db767..bda81c97 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -70,15 +70,15 @@ public String toString() { @SuppressWarnings("rawtypes") protected final Boolean get(Function deriver, Object... in) { - Set empty = deriver == null ? Set.of() : null; + Set empty = Set.of(); Map vars = VARIABLES.get(); Object[] out = in.clone(); for (int i = 0; i < in.length; i++) { while (vars.containsKey(in[i])) { Object v = vars.get(in[i]); if (v == null) { + empty = empty.add(in[i]); if (deriver == null) { - empty = empty.add(out[i]); out[i] = null; } break; @@ -89,42 +89,44 @@ protected final Boolean get(Function deriver, Object... in) { } } S s = struct(out); - if (deriver != null) { - Pair slot = Pair.of(this, s); - List> pre = DERIVED.get(); - if (pre.contains(slot)) { - throw new CircularLogicException(pre, slot); - } else { - return DERIVED.get(pre.prepend(slot), () -> deriver.apply(s)); - } - } else { - Set set = extend.get(s); - if (set.isEmpty()) { - return false; - } else if (!empty.isEmpty()) { - Set em = empty; - throw new BindingsFoundException(set.map(b -> { - Map vs = Map.of(); - for (int i = 0; i < b.length(); i++) { - Object vin = in[i]; - if (em.contains(vin)) { - vs = vs.put(vin, b.get(i)); - } + Set set = deriver == null || empty.isEmpty() ? extend.get(s) : Set.of(); + if (set.isEmpty()) { + if (deriver != null) { + Pair slot = Pair.of(this, s); + List> pre = DERIVED.get(); + if (pre.contains(slot)) { + throw new CircularLogicException(pre, slot); + } else { + Boolean result = DERIVED.get(pre.prepend(slot), () -> deriver.apply(s)); + if (result) { + extend.force(s, Set::add, s); } - return vs; - }).asSet()); + return result; + } } else { - return true; + return Boolean.FALSE; } + } else if (!empty.isEmpty()) { + Set em = empty; + throw new BindingsFoundException(set.map(b -> { + Map vs = Map.of(); + for (int i = 0; i < b.length(); i++) { + Object vin = in[i]; + if (em.contains(vin)) { + vs = vs.put(vin, b.get(i)); + } + } + return vs; + }).asSet()); + } else { + return Boolean.TRUE; } } @SuppressWarnings("rawtypes") - protected final void set(S in, Boolean res, Function deriver) { - if (res && deriver == null) { - extend.force(in, Set::add, in); - set(0, in, in.toArray()); - } + protected final void set(S in) { + extend.force(in, Set::add, in); + set(0, in, in.toArray()); } private void set(int i, S in, Object[] array) { @@ -194,7 +196,7 @@ public Supplier is(O1 o1) { } public void fact(O1 o1) { - set(Single.of(o1), true, deriver); + set(Single.of(o1)); } @SuppressWarnings("unchecked") @@ -223,7 +225,7 @@ public Supplier is(O1 o1, O2 o2) { } public void fact(O1 o1, O2 o2) { - set(Pair.of(o1, o2), true, deriver); + set(Pair.of(o1, o2)); } @SuppressWarnings("unchecked") @@ -252,7 +254,7 @@ public Supplier is(O1 o1, O2 o2, O3 o3) { } public void fact(O1 o1, O2 o2, O3 o3) { - set(Triple.of(o1, o2, o3), true, deriver); + set(Triple.of(o1, o2, o3)); } @SuppressWarnings("unchecked") @@ -281,7 +283,7 @@ public Supplier is(O1 o1, O2 o2, O3 o3, O4 o4) { } public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { - set(Quadruple.of(o1, o2, o3, o4), true, deriver); + set(Quadruple.of(o1, o2, o3, o4)); } @SuppressWarnings("unchecked") From 7808459219dde0e53c6da5822c1f0f0ca20fbdb4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 13:11:34 +0100 Subject: [PATCH 076/179] Typed using Dynamic Proxies --- .../java/org/modelingvalue/dclare/Logic.java | 57 +++++++++++-- .../modelingvalue/dclare/test/LogicTest.java | 81 +++++++++++-------- 2 files changed, 99 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index bda81c97..0c590aef 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -20,6 +20,9 @@ package org.modelingvalue.dclare; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiPredicate; import java.util.function.Function; @@ -32,7 +35,6 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.Struct; -import org.modelingvalue.collections.struct.impl.StructImpl; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.QuadPredicate; @@ -48,14 +50,59 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Context>> DERIVED = Context.of(List.of()); - public static final class Relation extends StructImpl { - private static final long serialVersionUID = -3477936037166526320L; + public static interface Variable { + } + + public static interface Thing { + } + + @SuppressWarnings("unchecked") + public static T var(Class type, String name) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(name)); + } - public Relation(Object... data) { - super(data); + @SuppressWarnings("unchecked") + public static T obj(Class type, String name) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Thing.class}, new DynamicClass(name)); + } + + private static final class DynamicClass implements InvocationHandler { + + private static Method EQUALS; + private static Method HASHCODE; + private static Method TO_STRING; + static { + try { + EQUALS = Object.class.getMethod("equals", Object.class); + HASHCODE = Object.class.getMethod("hashCode"); + TO_STRING = Object.class.getMethod("toString"); + } catch (NoSuchMethodException | SecurityException e) { + throw new Error(e); + } + } + + private final String name; + + public DynamicClass(String name) { + this.name = name; + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if (method.equals(EQUALS)) { + return proxy == args[0] ? Boolean.TRUE : Boolean.FALSE; + } else if (method.equals(HASHCODE)) { + return Integer.valueOf(System.identityHashCode(proxy)); + } else if (method.equals(TO_STRING)) { + return name; + } else { + throw new Error("unexpected Object method dispatched: " + method); + } } } + // Functors + public static abstract class Functor { private final Constant> extend; diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index ed897d3e..febe921c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -24,9 +24,11 @@ import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; +import java.util.concurrent.ThreadLocalRandom; import java.util.function.Supplier; import org.junit.jupiter.api.RepeatedTest; +import org.modelingvalue.collections.Collection; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -35,7 +37,8 @@ public class LogicTest { void run(Runnable test) { UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); - universeTransaction.put("test", test); + boolean seq = ThreadLocalRandom.current().nextBoolean(); + universeTransaction.put("test", seq ? Collection.sequential(test) : test); universeTransaction.stop(); universeTransaction.waitForEnd(); } @@ -48,42 +51,52 @@ static void isFalse(Supplier bs) { assertTrue(!bs.get()); } - static final Rel2 PARENT = rel2("parent"); - static final Rel2 ANCESTOR = rel2("ancestor"); - - static final String A = "A"; // Ancestor - static final String O = "O"; // Offspring - static final String R = "R"; // Relative - static { - ANCESTOR.rule(A, O, PARENT.is(A, O)); // - ANCESTOR.rule(A, O, uni(R, and(ANCESTOR.is(A, R), PARENT.is(R, O)))); - } - @RepeatedTest(1024) public void test1() { run(() -> { - PARENT.fact("Carel", "Jan"); - PARENT.fact("Jan", "Wim"); - PARENT.fact("Elske", "Wim"); - PARENT.fact("Wim", "Joppe"); - PARENT.fact("Heleen", "Joppe"); - PARENT.fact("Wim", "Marijn"); - PARENT.fact("Heleeen", "Marijn"); - - isTrue(PARENT.is("Heleen", "Joppe")); - isTrue(PARENT.is("Jan", "Wim")); - - isFalse(PARENT.is("Marijn", "Wim")); - isFalse(PARENT.is("Heleeen", "Wim")); - isFalse(PARENT.is("Wim", "Wim")); - - isTrue(ANCESTOR.is("Wim", "Marijn")); - isTrue(ANCESTOR.is("Carel", "Marijn")); - - isFalse(ANCESTOR.is("Marijn", "Wim")); - isFalse(ANCESTOR.is("Heleeen", "Wim")); - isFalse(ANCESTOR.is("Joppe", "Carel")); - isFalse(ANCESTOR.is("Carel", "Carel")); + interface Person { + } + + Rel2 PARENT = rel2("parent"); + Rel2 ANCESTOR = rel2("ancestor"); + + Person A = var(Person.class, "A"); // Ancestor + Person O = var(Person.class, "O"); // Offspring + Person R = var(Person.class, "R"); // Relative + + ANCESTOR.rule(A, O, PARENT.is(A, O)); + ANCESTOR.rule(A, O, uni(R, and(ANCESTOR.is(A, R), PARENT.is(R, O)))); + + Person Carel = obj(Person.class, "Carel"); + Person Jan = obj(Person.class, "Jan"); + Person Elske = obj(Person.class, "Elske"); + Person Wim = obj(Person.class, "Wim"); + Person Joppe = obj(Person.class, "Joppe"); + Person Heleen = obj(Person.class, "Heleen"); + Person Marijn = obj(Person.class, "Marijn"); + + PARENT.fact(Carel, Jan); + PARENT.fact(Jan, Wim); + PARENT.fact(Elske, Wim); + PARENT.fact(Wim, Joppe); + PARENT.fact(Heleen, Joppe); + PARENT.fact(Wim, Marijn); + PARENT.fact(Heleen, Marijn); + + isTrue(PARENT.is(Heleen, Joppe)); + isTrue(PARENT.is(Jan, Wim)); + + isFalse(PARENT.is(Marijn, Wim)); + isFalse(PARENT.is(Heleen, Wim)); + isFalse(PARENT.is(Wim, Wim)); + + isTrue(ANCESTOR.is(Wim, Marijn)); + isTrue(ANCESTOR.is(Carel, Marijn)); + + isFalse(ANCESTOR.is(Marijn, Wim)); + isFalse(ANCESTOR.is(Heleen, Wim)); + isFalse(ANCESTOR.is(Joppe, Carel)); + isFalse(ANCESTOR.is(Carel, Carel)); }); } } From db30e1751d7282b9b1e02f0634581323a180cd1f Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 13:20:23 +0100 Subject: [PATCH 077/179] naming example --- .../modelingvalue/dclare/test/LogicTest.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index febe921c..dd928c6a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -57,15 +57,15 @@ public void test1() { interface Person { } - Rel2 PARENT = rel2("parent"); - Rel2 ANCESTOR = rel2("ancestor"); + Rel2 parent_child = rel2("PC"); + Rel2 ancestor_descendent = rel2("AD"); Person A = var(Person.class, "A"); // Ancestor - Person O = var(Person.class, "O"); // Offspring + Person D = var(Person.class, "D"); // Descendent Person R = var(Person.class, "R"); // Relative - ANCESTOR.rule(A, O, PARENT.is(A, O)); - ANCESTOR.rule(A, O, uni(R, and(ANCESTOR.is(A, R), PARENT.is(R, O)))); + ancestor_descendent.rule(A, D, parent_child.is(A, D)); + ancestor_descendent.rule(A, D, uni(R, and(ancestor_descendent.is(A, R), parent_child.is(R, D)))); Person Carel = obj(Person.class, "Carel"); Person Jan = obj(Person.class, "Jan"); @@ -75,28 +75,28 @@ interface Person { Person Heleen = obj(Person.class, "Heleen"); Person Marijn = obj(Person.class, "Marijn"); - PARENT.fact(Carel, Jan); - PARENT.fact(Jan, Wim); - PARENT.fact(Elske, Wim); - PARENT.fact(Wim, Joppe); - PARENT.fact(Heleen, Joppe); - PARENT.fact(Wim, Marijn); - PARENT.fact(Heleen, Marijn); + parent_child.fact(Carel, Jan); + parent_child.fact(Jan, Wim); + parent_child.fact(Elske, Wim); + parent_child.fact(Wim, Joppe); + parent_child.fact(Heleen, Joppe); + parent_child.fact(Wim, Marijn); + parent_child.fact(Heleen, Marijn); - isTrue(PARENT.is(Heleen, Joppe)); - isTrue(PARENT.is(Jan, Wim)); + isTrue(parent_child.is(Heleen, Joppe)); + isTrue(parent_child.is(Jan, Wim)); - isFalse(PARENT.is(Marijn, Wim)); - isFalse(PARENT.is(Heleen, Wim)); - isFalse(PARENT.is(Wim, Wim)); + isFalse(parent_child.is(Marijn, Wim)); + isFalse(parent_child.is(Heleen, Wim)); + isFalse(parent_child.is(Wim, Wim)); - isTrue(ANCESTOR.is(Wim, Marijn)); - isTrue(ANCESTOR.is(Carel, Marijn)); + isTrue(ancestor_descendent.is(Wim, Marijn)); + isTrue(ancestor_descendent.is(Carel, Marijn)); - isFalse(ANCESTOR.is(Marijn, Wim)); - isFalse(ANCESTOR.is(Heleen, Wim)); - isFalse(ANCESTOR.is(Joppe, Carel)); - isFalse(ANCESTOR.is(Carel, Carel)); + isFalse(ancestor_descendent.is(Marijn, Wim)); + isFalse(ancestor_descendent.is(Heleen, Wim)); + isFalse(ancestor_descendent.is(Joppe, Carel)); + isFalse(ancestor_descendent.is(Carel, Carel)); }); } } From c8878572bf9a7b4ca9f1b6fcc43c6a5dd6946021 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 14:01:41 +0100 Subject: [PATCH 078/179] First steps for support for Structers in Logic --- .../java/org/modelingvalue/dclare/Logic.java | 70 ++++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 7 +- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 0c590aef..615047ef 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -35,6 +35,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.Struct; +import org.modelingvalue.collections.struct.impl.StructImpl; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; import org.modelingvalue.collections.util.QuadPredicate; @@ -53,24 +54,52 @@ private Logic() { public static interface Variable { } - public static interface Thing { + public static interface Relation { + } + + public static interface Relation1 extends Relation { + } + + public static interface Relation2 extends Relation { + } + + public static interface Relation3 extends Relation { + } + + public static interface Relation4 extends Relation { } @SuppressWarnings("unchecked") - public static T var(Class type, String name) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(name)); + public static T var(Class type, String id) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(id, type)); } @SuppressWarnings("unchecked") - public static T obj(Class type, String name) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Thing.class}, new DynamicClass(name)); + public static > T obj(Class type, R1 id1) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, type)); } - private static final class DynamicClass implements InvocationHandler { + @SuppressWarnings("unchecked") + public static > T obj(Class type, R1 id1, R2 id2) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, type)); + } - private static Method EQUALS; - private static Method HASHCODE; - private static Method TO_STRING; + @SuppressWarnings("unchecked") + public static > T obj(Class type, R1 id1, R2 id2, R3 id3) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, id3, type)); + } + + @SuppressWarnings("unchecked") + public static > T obj(Class type, R1 id1, R2 id2, R3 id3, R4 id4) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, id3, id4, type)); + } + + private static final class DynamicClass extends StructImpl implements InvocationHandler { + private static final long serialVersionUID = 7315776001191198132L; + + private static final Method EQUALS; + private static final Method HASHCODE; + private static final Method TO_STRING; static { try { EQUALS = Object.class.getMethod("equals", Object.class); @@ -81,22 +110,29 @@ private static final class DynamicClass implements InvocationHandler { } } - private final String name; - - public DynamicClass(String name) { - this.name = name; + private DynamicClass(Object... id) { + super(id); } @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (method.equals(EQUALS)) { - return proxy == args[0] ? Boolean.TRUE : Boolean.FALSE; + if (proxy == args[0]) { + return true; + } else if (args[0] == null) { + return false; + } else if (args[0].getClass() != proxy.getClass()) { + return false; + } else { + DynamicClass other = (DynamicClass) Proxy.getInvocationHandler(args[0]); + return super.equals(other); + } } else if (method.equals(HASHCODE)) { - return Integer.valueOf(System.identityHashCode(proxy)); + return super.hashCode(); } else if (method.equals(TO_STRING)) { - return name; + return super.toString(); } else { - throw new Error("unexpected Object method dispatched: " + method); + throw new Error("No handler for " + method); } } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index dd928c6a..aa409d0d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -30,6 +30,8 @@ import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; import org.modelingvalue.dclare.Logic.Rel2; +import org.modelingvalue.dclare.Logic.Relation1; +import org.modelingvalue.dclare.Logic.Relation2; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -54,7 +56,10 @@ static void isFalse(Supplier bs) { @RepeatedTest(1024) public void test1() { run(() -> { - interface Person { + interface Person extends Relation1 { + } + + interface ParentChild extends Relation2 { } Rel2 parent_child = rel2("PC"); From 29e60a62e6d23f15f8baee2af65c406bacdeb729 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 16:04:42 +0100 Subject: [PATCH 079/179] more structure preparation --- .../java/org/modelingvalue/dclare/Logic.java | 115 +++++++++++++++++- .../modelingvalue/dclare/test/LogicTest.java | 83 ++++++++++--- 2 files changed, 177 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 615047ef..b7d3665b 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -55,43 +55,68 @@ public static interface Variable { } public static interface Relation { + Class type(); + } + + public static interface Relation0 extends Relation { } public static interface Relation1 extends Relation { + R1 get1(); } public static interface Relation2 extends Relation { + R1 get1(); + + R2 get2(); } public static interface Relation3 extends Relation { + R1 get1(); + + R2 get2(); + + R3 get3(); } public static interface Relation4 extends Relation { + R1 get1(); + + R2 get2(); + + R3 get3(); + + R4 get4(); } @SuppressWarnings("unchecked") public static T var(Class type, String id) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(id, type)); + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(type, id)); + } + + @SuppressWarnings("unchecked") + public static T obj(Class type) { + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type)); } @SuppressWarnings("unchecked") public static > T obj(Class type, R1 id1) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, type)); + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1)); } @SuppressWarnings("unchecked") public static > T obj(Class type, R1 id1, R2 id2) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, type)); + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2)); } @SuppressWarnings("unchecked") public static > T obj(Class type, R1 id1, R2 id2, R3 id3) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, id3, type)); + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2, id3)); } @SuppressWarnings("unchecked") public static > T obj(Class type, R1 id1, R2 id2, R3 id3, R4 id4) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(id1, id2, id3, id4, type)); + return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2, id3, id4)); } private static final class DynamicClass extends StructImpl implements InvocationHandler { @@ -114,6 +139,7 @@ private DynamicClass(Object... id) { super(id); } + @SuppressWarnings({"unchecked", "rawtypes"}) @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (method.equals(EQUALS)) { @@ -130,13 +156,90 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } else if (method.equals(HASHCODE)) { return super.hashCode(); } else if (method.equals(TO_STRING)) { - return super.toString(); + if (proxy instanceof L) { + return list((L) proxy).toString().substring(4); + } else { + String string = super.toString(); + return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; + } + } else if (method.getName().equals("get1")) { + return super.get(1); + } else if (method.getName().equals("get2")) { + return super.get(2); + } else if (method.getName().equals("get3")) { + return super.get(3); + } else if (method.getName().equals("get4")) { + return super.get(4); + } else if (method.getName().equals("type")) { + return super.get(0); } else { throw new Error("No handler for " + method); } } } + // Facts, Rules, Is + + public interface L extends Relation { + } + + private interface EL extends L, Relation0 { + } + + private interface NEL extends L, Relation2> { + } + + @SuppressWarnings("unchecked") + public static L l(E head, L tail) { + return obj(NEL.class, head, tail); + } + + @SuppressWarnings("rawtypes") + private static final L EMPTY = obj(EL.class); + + @SuppressWarnings("unchecked") + private static List list(L l) { + List list = List.of(); + while (l instanceof NEL) { + list = list.prepend(((NEL) l).get1()); + l = ((NEL) l).get2(); + } + return list; + } + + @SuppressWarnings("unchecked") + public static L l(E... es) { + L l = EMPTY; + for (int i = es.length - 1; i >= 0; i--) { + l = l(es[i], l); + } + return l; + } + + public static interface Fact extends Relation1 { + } + + public static Fact fact(Relation rel) { + return obj(Fact.class, rel); + } + + public static interface Rule extends Relation3, L> { + } + + public static Rule rule(Relation rel, Relation... variablesPredicates) { + List list = List.of(variablesPredicates); + List variables = list.filter(r -> r instanceof Variable).asList(); + List predicates = list.filter(r -> !(r instanceof Variable)).asList(); + return obj(Rule.class, rel, l(variables.toArray(i -> new Relation[i])), l(predicates.toArray(i -> new Relation[i]))); + } + + public static interface Is extends Relation1> { + } + + public static Is is(Relation... predicates) { + return obj(Is.class, l(predicates)); + } + // Functors public static abstract class Functor { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index aa409d0d..64ab50f2 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -29,9 +29,12 @@ import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; +import org.modelingvalue.dclare.Logic; +import org.modelingvalue.dclare.Logic.Is; import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Logic.Relation1; import org.modelingvalue.dclare.Logic.Relation2; +import org.modelingvalue.dclare.Logic.Rule; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -53,32 +56,82 @@ static void isFalse(Supplier bs) { assertTrue(!bs.get()); } + static void isTrue(Is is) { + } + + static void isFalse(Is is) { + } + + interface Person extends Relation1 { + } + + Person person(String name) { + return obj(Person.class, name); + } + + Person var(String name) { + return Logic.var(Person.class, name); + } + + interface ParentChild extends Relation2 { + } + + ParentChild parentChild(Person parent, Person child) { + return obj(ParentChild.class, parent, child); + } + + interface AncestorDescendent extends Relation2 { + } + + AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { + return obj(AncestorDescendent.class, ancestor, descendent); + } + @RepeatedTest(1024) - public void test1() { + public void test0() { run(() -> { - interface Person extends Relation1 { - } + Person Carel = person("Carel"); + Person Jan = person("Jan"); + Person Wim = person("Wim"); + Person Joppe = person("Joppe"); + + Person A = var("A"); // Ancestor + Person D = var("D"); // Descendent + Person R = var("R"); // Relative + + fact(parentChild(Carel, Jan)); + fact(parentChild(Jan, Wim)); + fact(parentChild(Wim, Joppe)); - interface ParentChild extends Relation2 { - } + rule(ancestorDescendent(A, D), parentChild(A, D)); + Rule r = rule(ancestorDescendent(A, D), R, ancestorDescendent(A, R), parentChild(R, D)); + isTrue(is(ancestorDescendent(Carel, Joppe))); + + isFalse(is(ancestorDescendent(Wim, Carel))); + }); + } + + @RepeatedTest(1024) + public void test1() { + run(() -> { Rel2 parent_child = rel2("PC"); Rel2 ancestor_descendent = rel2("AD"); - Person A = var(Person.class, "A"); // Ancestor - Person D = var(Person.class, "D"); // Descendent - Person R = var(Person.class, "R"); // Relative + Person A = var("A"); // Ancestor + Person D = var("D"); // Descendent + Person R = var("R"); // Relative ancestor_descendent.rule(A, D, parent_child.is(A, D)); ancestor_descendent.rule(A, D, uni(R, and(ancestor_descendent.is(A, R), parent_child.is(R, D)))); - Person Carel = obj(Person.class, "Carel"); - Person Jan = obj(Person.class, "Jan"); - Person Elske = obj(Person.class, "Elske"); - Person Wim = obj(Person.class, "Wim"); - Person Joppe = obj(Person.class, "Joppe"); - Person Heleen = obj(Person.class, "Heleen"); - Person Marijn = obj(Person.class, "Marijn"); + Person Carel = person("Carel"); + Person Jan = person("Jan"); + Person Elske = person("Elske"); + Person Wim = person("Wim"); + Person Joppe = person("Joppe"); + Person Heleen = person("Heleen"); + Person Marijn = person("Marijn"); parent_child.fact(Carel, Jan); parent_child.fact(Jan, Wim); From e27b54ca539be85b06fa6ffd724eb7c260e7fdaf Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 16:05:13 +0100 Subject: [PATCH 080/179] unused --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 64ab50f2..0900d0e0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -34,7 +34,6 @@ import org.modelingvalue.dclare.Logic.Rel2; import org.modelingvalue.dclare.Logic.Relation1; import org.modelingvalue.dclare.Logic.Relation2; -import org.modelingvalue.dclare.Logic.Rule; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -104,7 +103,7 @@ public void test0() { fact(parentChild(Wim, Joppe)); rule(ancestorDescendent(A, D), parentChild(A, D)); - Rule r = rule(ancestorDescendent(A, D), R, ancestorDescendent(A, R), parentChild(R, D)); + rule(ancestorDescendent(A, D), R, ancestorDescendent(A, R), parentChild(R, D)); isTrue(is(ancestorDescendent(Carel, Joppe))); From f4d98a56e9372269183ffd347af84d046ca55928 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 18 Nov 2024 16:09:46 +0100 Subject: [PATCH 081/179] switch in proxy --- .../java/org/modelingvalue/dclare/Logic.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index b7d3665b..1d934b9e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -162,17 +162,19 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl String string = super.toString(); return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; } - } else if (method.getName().equals("get1")) { - return super.get(1); - } else if (method.getName().equals("get2")) { - return super.get(2); - } else if (method.getName().equals("get3")) { - return super.get(3); - } else if (method.getName().equals("get4")) { - return super.get(4); - } else if (method.getName().equals("type")) { - return super.get(0); } else { + switch (method.getName()) { + case "get1": + return super.get(1); + case "get2": + return super.get(2); + case "get3": + return super.get(3); + case "get4": + return super.get(4); + case "type": + return super.get(0); + } throw new Error("No handler for " + method); } } From 3e50b9ed2e3742c65259a3a29fbfa58701a40ed2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 19 Nov 2024 14:36:09 +0100 Subject: [PATCH 082/179] almost refactored --- .../java/org/modelingvalue/dclare/Logic.java | 659 ++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 101 +-- 2 files changed, 306 insertions(+), 454 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 1d934b9e..77c3d19e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -23,10 +23,8 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.Arrays; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.BiPredicate; -import java.util.function.Function; -import java.util.function.Predicate; import java.util.function.Supplier; import org.modelingvalue.collections.Collection; @@ -34,92 +32,24 @@ import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.struct.Struct; import org.modelingvalue.collections.struct.impl.StructImpl; import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; -import org.modelingvalue.collections.util.QuadPredicate; -import org.modelingvalue.collections.util.Quadruple; -import org.modelingvalue.collections.util.Single; -import org.modelingvalue.collections.util.TriPredicate; -import org.modelingvalue.collections.util.Triple; public final class Logic { private Logic() { } @SuppressWarnings("rawtypes") - private static final Context>> DERIVED = Context.of(List.of()); + private static final Context> DERIVED = Context.of(List.of()); - public static interface Variable { - } - - public static interface Relation { - Class type(); - } - - public static interface Relation0 extends Relation { - } - - public static interface Relation1 extends Relation { - R1 get1(); - } - - public static interface Relation2 extends Relation { - R1 get1(); - - R2 get2(); - } - - public static interface Relation3 extends Relation { - R1 get1(); - - R2 get2(); - - R3 get3(); - } - - public static interface Relation4 extends Relation { - R1 get1(); - - R2 get2(); - - R3 get3(); - - R4 get4(); - } - - @SuppressWarnings("unchecked") - public static T var(Class type, String id) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type, Variable.class}, new DynamicClass(type, id)); - } - - @SuppressWarnings("unchecked") - public static T obj(Class type) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type)); - } - - @SuppressWarnings("unchecked") - public static > T obj(Class type, R1 id1) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1)); - } - - @SuppressWarnings("unchecked") - public static > T obj(Class type, R1 id1, R2 id2) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2)); - } - - @SuppressWarnings("unchecked") - public static > T obj(Class type, R1 id1, R2 id2, R3 id3) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2, id3)); - } + @SuppressWarnings("rawtypes") + private static final Constant> FACTS = Constant.of("FACTS", Set.of(), CoreSetableModifier.durable); - @SuppressWarnings("unchecked") - public static > T obj(Class type, R1 id1, R2 id2, R3 id3, R4 id4) { - return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new DynamicClass(type, id1, id2, id3, id4)); - } + @SuppressWarnings("rawtypes") + private static final Constant, Set> RULES = Constant.of("RULES", Set.of(), CoreSetableModifier.durable); - private static final class DynamicClass extends StructImpl implements InvocationHandler { + private static abstract class AbstractTermImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; private static final Method EQUALS; @@ -135,10 +65,6 @@ private static final class DynamicClass extends StructImpl implements Invocation } } - private DynamicClass(Object... id) { - super(id); - } - @SuppressWarnings({"unchecked", "rawtypes"}) @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -150,123 +76,158 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } else if (args[0].getClass() != proxy.getClass()) { return false; } else { - DynamicClass other = (DynamicClass) Proxy.getInvocationHandler(args[0]); - return super.equals(other); + return super.equals(Logic.unproxy(args[0])); } } else if (method.equals(HASHCODE)) { return super.hashCode(); } else if (method.equals(TO_STRING)) { - if (proxy instanceof L) { - return list((L) proxy).toString().substring(4); - } else { - String string = super.toString(); - return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; - } + return toString(); } else { - switch (method.getName()) { - case "get1": - return super.get(1); - case "get2": - return super.get(2); - case "get3": - return super.get(3); - case "get4": - return super.get(4); - case "type": - return super.get(0); - } throw new Error("No handler for " + method); } } - } - // Facts, Rules, Is + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public String toString() { + if (functor() == L.class) { + List list = List.of(); + AbstractTermImpl ht = this; + while (ht.length() == 2) { + list = list.prepend(ht.get(1)); + ht = (AbstractTermImpl) ht.get(2); + } + return list.toString().substring(4); + } else { + String string = super.toString(); + return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; + } + } + + protected AbstractTermImpl(Class functor, Object... args) { + super(unproxy(functor, args)); + } - public interface L extends Relation { - } + @SuppressWarnings("rawtypes") + private static final Object[] unproxy(Class functor, Object[] args) { + Object[] result = new Object[args.length + 1]; + result[0] = functor; + for (int i = 0; i < args.length; i++) { + result[i + 1] = Logic.unproxy(args[i]); + } + return result; + } - private interface EL extends L, Relation0 { - } + protected abstract F proxy(); - private interface NEL extends L, Relation2> { + @SuppressWarnings("unchecked") + protected Class functor() { + return (Class) get(0); + } } - @SuppressWarnings("unchecked") - public static L l(E head, L tail) { - return obj(NEL.class, head, tail); + @SuppressWarnings("rawtypes") + private static final Object unproxy(Object object) { + if (object instanceof Term) { + return Proxy.getInvocationHandler(object); + } else { + return object; + } } @SuppressWarnings("rawtypes") - private static final L EMPTY = obj(EL.class); + private static final TermImpl unproxy(Term object) { + return (TermImpl) Proxy.getInvocationHandler(object); + } - @SuppressWarnings("unchecked") - private static List list(L l) { - List list = List.of(); - while (l instanceof NEL) { - list = list.prepend(((NEL) l).get1()); - l = ((NEL) l).get2(); - } - return list; + // Variables + + public static interface Variable { } @SuppressWarnings("unchecked") - public static L l(E... es) { - L l = EMPTY; - for (int i = es.length - 1; i >= 0; i--) { - l = l(es[i], l); - } - return l; + public static F var(Class functor, String id) { + return new VarImpl(functor, id).proxy(); } - public static interface Fact extends Relation1 { - } + private static final class VarImpl extends AbstractTermImpl { + private static final long serialVersionUID = -8998368070388908726L; - public static Fact fact(Relation rel) { - return obj(Fact.class, rel); - } + private VarImpl(Class functor, String name) { + super(functor, name); + } - public static interface Rule extends Relation3, L> { + @Override + @SuppressWarnings("unchecked") + protected final F proxy() { + return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Variable.class}, this); + } } - public static Rule rule(Relation rel, Relation... variablesPredicates) { - List list = List.of(variablesPredicates); - List variables = list.filter(r -> r instanceof Variable).asList(); - List predicates = list.filter(r -> !(r instanceof Variable)).asList(); - return obj(Rule.class, rel, l(variables.toArray(i -> new Relation[i])), l(predicates.toArray(i -> new Relation[i]))); - } + // Terms - public static interface Is extends Relation1> { + public static interface Term { } - public static Is is(Relation... predicates) { - return obj(Is.class, l(predicates)); + @SuppressWarnings("unchecked") + public static F term(Class functor, Object... args) { + return new TermImpl(functor).proxy(); } - // Functors - - public static abstract class Functor { - private final Constant> extend; + private static class TermImpl extends AbstractTermImpl implements Supplier { + private static final long serialVersionUID = -1605559565948158856L; - protected Functor(Object id) { - extend = Constant.> of(id, Set.of(), CoreSetableModifier.durable); + private TermImpl(Class functor, Object... args) { + super(functor, args); } @Override - public String toString() { - return extend.toString(); + @SuppressWarnings("unchecked") + protected F proxy() { + return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Term.class}, this); } @SuppressWarnings("rawtypes") - protected final Boolean get(Function deriver, Object... in) { + protected final void makeFact() { + FACTS.force(this, Set::add, this); + patterns(1, toArray()); + } + + private void patterns(int i, Object[] array) { + if (i < length()) { + array = array.clone(); + if (array[i] == null) { + array[i] = get(i); + FACTS.force(term(array), Set::add, this); + } + patterns(i + 1, array); + if (array[i] != null) { + array[i] = null; + FACTS.force(term(array), Set::add, this); + } + patterns(i + 1, array); + } + } + + @SuppressWarnings("unchecked") + protected TermImpl term(Object[] array) { + return new TermImpl(functor(), Arrays.copyOfRange(array, 1, array.length)); + } + + @SuppressWarnings("rawtypes") + @Override + public Boolean get() { + Set rules = RULES.get(Pair.of(functor(), length() - 1)); Set empty = Set.of(); Map vars = VARIABLES.get(); - Object[] out = in.clone(); + Object[] in = toArray(); + Object[] out = toArray(); for (int i = 0; i < in.length; i++) { while (vars.containsKey(in[i])) { Object v = vars.get(in[i]); if (v == null) { empty = empty.add(in[i]); - if (deriver == null) { + if (rules.isEmpty()) { out[i] = null; } break; @@ -276,18 +237,18 @@ protected final Boolean get(Function deriver, Object... in) { } } } - S s = struct(out); - Set set = deriver == null || empty.isEmpty() ? extend.get(s) : Set.of(); + TermImpl term = term(out); + Set set = rules.isEmpty() || empty.isEmpty() ? FACTS.get(term) : Set.of(); if (set.isEmpty()) { - if (deriver != null) { - Pair slot = Pair.of(this, s); - List> pre = DERIVED.get(); - if (pre.contains(slot)) { - throw new CircularLogicException(pre, slot); + if (!rules.isEmpty()) { + List pre = DERIVED.get(); + if (pre.contains(term)) { + throw new CircularLogicException(pre, term); } else { - Boolean result = DERIVED.get(pre.prepend(slot), () -> deriver.apply(s)); + // actualize rules + Boolean result = DERIVED.get(pre.prepend(term), any(rules)); if (result) { - extend.force(s, Set::add, s); + FACTS.force(term, Set::add, term); } return result; } @@ -310,32 +271,10 @@ protected final Boolean get(Function deriver, Object... in) { return Boolean.TRUE; } } - - @SuppressWarnings("rawtypes") - protected final void set(S in) { - extend.force(in, Set::add, in); - set(0, in, in.toArray()); - } - - private void set(int i, S in, Object[] array) { - if (i < array.length) { - array = array.clone(); - if (array[i] == null) { - array[i] = in.get(i); - extend.force(struct(array), Set::add, in); - } - set(i + 1, in, array); - if (array[i] != null) { - array[i] = null; - extend.force(struct(array), Set::add, in); - } - set(i + 1, in, array); - } - } - - protected abstract S struct(Object[] array); }; + private static final Context> VARIABLES = Context.of(Map.of()); + @SuppressWarnings("rawtypes") private static boolean run(Map vars, Supplier predicate) { Map pre = VARIABLES.get(); @@ -347,265 +286,215 @@ private static boolean run(Map vars, Supplier predicate } } - // Relations + // Rules - public static final Rel1 rel1(Object id) { - return new Rel1(id); + public static interface Rule extends Term { } - public static final Rel2 rel2(Object id) { - return new Rel2(id); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Rule rule(Term term, Term... goals) { + RuleImpl ruleImpl = new RuleImpl(term, goal(goals)); + TermImpl termImpl = unproxy(term); + RULES.force(Pair.of(termImpl.functor(), termImpl.length() - 1), Set::add, ruleImpl); + return ruleImpl.proxy(); } - public static final Rel3 rel3(Object id) { - return new Rel3(id); - } + private static final class RuleImpl extends TermImpl { + private static final long serialVersionUID = -4602043866952049391L; - public static final Rel4 rel4(Object id) { - return new Rel4(id); - } - - public static final class Rel1 extends Functor> { - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; - - private Rel1(Object id) { - super(id); + private RuleImpl(Term term, Goal goal) { + super(Rule.class, term, goal); } - public void rule(O1 v1, Supplier p) { - rules = rules.add(o1 -> run(Map.of(Entry.of(v1, o1)), p)); - deriver = s -> any(rules.map(r -> () -> r.test(s.a()))).get(); + private RuleImpl(Object term, Object goal) { + super(Rule.class, term, goal); } + @Override @SuppressWarnings("unchecked") - public Supplier is(O1 o1) { - return () -> get(deriver, o1); + protected final Rule proxy() { + return (Rule) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{Rule.class}, this); } - public void fact(O1 o1) { - set(Single.of(o1)); + @Override + @SuppressWarnings("rawtypes") + public Boolean get() { + return ((GoalImpl) get(2)).get(); } - @SuppressWarnings("unchecked") @Override - protected Single struct(Object[] array) { - return Single.of((O1) array[0]); + @SuppressWarnings("unchecked") + protected RuleImpl term(Object[] array) { + return new RuleImpl(array[1], array[2]); } } - public static final class Rel2 extends Functor> { - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; - - private Rel2(Object id) { - super(id); - } + // Goals - public void rule(O1 v1, O2 v2, Supplier p) { - rules = rules.add((o1, o2) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2)), p)); - deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b()))).get(); - } - - @SuppressWarnings("unchecked") - public Supplier is(O1 o1, O2 o2) { - return () -> get(deriver, o1, o2); - } + public static interface Goal extends Term { + } - public void fact(O1 o1, O2 o2) { - set(Pair.of(o1, o2)); - } + public static boolean is(Term... goals) { + return new GoalImpl(l(goals)).get(); + } - @SuppressWarnings("unchecked") - @Override - protected Pair struct(Object[] array) { - return Pair.of((O1) array[0], (O2) array[1]); - } + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Goal goal(Term... goals) { + return new GoalImpl(l(goals)).proxy(); } - public static final class Rel3 extends Functor> { - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; + private static final class GoalImpl extends TermImpl { + private static final long serialVersionUID = -4100263206389367132L; - private Rel3(Object id) { - super(id); + private GoalImpl(L goals) { + super(Goal.class, goals); } - public void rule(O1 v1, O2 v2, O3 v3, Supplier p) { - rules = rules.add((o1, o2, o3) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2), Entry.of(v3, o3)), p)); - deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b(), s.c()))).get(); + private GoalImpl(Object goals) { + super(Goal.class, goals); } + @Override @SuppressWarnings("unchecked") - public Supplier is(O1 o1, O2 o2, O3 o3) { - return () -> get(deriver, o1, o2, o3); - } - - public void fact(O1 o1, O2 o2, O3 o3) { - set(Triple.of(o1, o2, o3)); + protected final Goal proxy() { + return (Goal) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{Goal.class}, this); } - @SuppressWarnings("unchecked") @Override - protected Triple struct(Object[] array) { - return Triple.of((O1) array[0], (O2) array[1], (O3) array[2]); - } - } - - public static final class Rel4 extends Functor> { - private Set> rules = Set.of(); - private Function, Boolean> deriver = null; - - private Rel4(Object id) { - super(id); - } - - public void rule(O1 v1, O2 v2, O3 v3, O4 v4, Supplier p) { - rules = rules.add((o1, o2, o3, o4) -> run(Map.of(Entry.of(v1, o1), Entry.of(v2, o2), Entry.of(v3, o3), Entry.of(v4, o4)), p)); - deriver = s -> any(rules.map(r -> () -> r.test(s.a(), s.b(), s.c(), s.d()))).get(); - } - @SuppressWarnings("unchecked") - public Supplier is(O1 o1, O2 o2, O3 o3, O4 o4) { - return () -> get(deriver, o1, o2, o3, o4); + protected GoalImpl term(Object[] array) { + return new GoalImpl(array[1]); } - public void fact(O1 o1, O2 o2, O3 o3, O4 o4) { - set(Quadruple.of(o1, o2, o3, o4)); - } - - @SuppressWarnings("unchecked") @Override - protected Quadruple struct(Object[] array) { - return Quadruple.of((O1) array[0], (O2) array[1], (O3) array[2], (O4) array[3]); + @SuppressWarnings("rawtypes") + public Boolean get() { + Set> set = Set.of(); + TermImpl ht = (TermImpl) get(0); + while (ht.length() == 2) { + set = set.add((TermImpl) ht.get(1)); + ht = (TermImpl) ht.get(2); + } + return uni(null, all(set)).get(); } } - // Not + // Lists - public static final Supplier not(Supplier predicate) { - return () -> !predicate.get(); + public interface L { } - // Or - - @SafeVarargs - public static final Supplier or(Supplier... predicates) { - List> list = List.of(predicates); - return list.isEmpty() ? () -> false : list.size() == 1 ? list.get(0) : () -> or(list); + @SuppressWarnings("unchecked") + public static L l(E head, L tail) { + return term(L.class, head, tail); } - public static final Supplier any(Collection> predicates) { - List> list = predicates.asList(); - return list.isEmpty() ? () -> false : list.size() == 1 ? list.get(0) : () -> or(list); - } + @SuppressWarnings("rawtypes") + private static final L EMPTY_LIST = term(L.class); - private static boolean or(List> predicates) { - List> or = predicates.random().asList(); - AtomicReference ref = new AtomicReference<>(null); - boolean result = or.anyMatch(p -> { - try { - return p.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CycleException ? bve : rte; - } - }); - return false; - } catch (CycleException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return false; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (!result && exc != null) { - throw exc; - } else { - return result; + @SuppressWarnings("unchecked") + public static L l(E... es) { + L l = EMPTY_LIST; + for (int i = es.length - 1; i >= 0; i--) { + l = l(es[i], l); } + return l; } - // And + // Facts, Is - @SafeVarargs - public static final Supplier and(Supplier... predicates) { - List> list = List.of(predicates); - return list.isEmpty() ? () -> true : list.size() == 1 ? list.get(0) : () -> and(list); + public static void fact(Term term) { + unproxy(term).makeFact(); } - public static final Supplier all(Collection> predicates) { - List> list = predicates.asList(); - return list.isEmpty() ? () -> true : list.size() == 1 ? list.get(0) : () -> and(list); - } + // Any - private static boolean and(List> predicates) { - List> and = predicates.random().asList(); - AtomicReference ref = new AtomicReference<>(null); - boolean result = and.allMatch(p -> { - try { - return p.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CycleException ? bve : rte; + @SuppressWarnings({"rawtypes", "unchecked"}) + private static Supplier any(Collection> terms) { + List> any = terms.random().asList(); + return () -> { + if (any.isEmpty()) { + return false; + } else if (any.size() == 1) { + return any.get(0).get(); + } else { + AtomicReference ref = new AtomicReference<>(null); + boolean result = any.anyMatch(t -> { + try { + return t.get(); + } catch (BindingsFoundException bve) { + ref.updateAndGet(rte -> { + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); + } else { + return rte == null || rte instanceof CycleException ? bve : rte; + } + }); + return false; + } catch (CycleException ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); + return false; } }); - return true; - } catch (CycleException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return true; + RuntimeException exc = ref.get(); + if (exc instanceof BindingsFoundException) { + throw exc; + } else if (!result && exc != null) { + throw exc; + } else { + return result; + } } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (result && exc != null) { - throw exc; - } else { - return result; - } + }; } - // Unification + // All - private static final Context> VARIABLES = Context.of(Map.of()); - - @SuppressWarnings("unchecked") - public static final Supplier uni(V1 v1, Supplier predicate) { - Map vars = Map.of(Entry.of(v1, null)); - return () -> doUni(vars, predicate); - } - - @SuppressWarnings("unchecked") - public static final Supplier uni(V1 v1, V2 v2, Supplier predicate) { - Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null)); - return () -> doUni(vars, predicate); - } - - @SuppressWarnings("unchecked") - public static final Supplier uni(V1 v1, V2 v2, V3 v3, Supplier predicate) { - Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null), Entry.of(v3, null)); - return () -> doUni(vars, predicate); + private static Supplier all(Collection> terms) { + List> all = terms.random().asList(); + return () -> { + if (all.isEmpty()) { + return true; + } else if (all.size() == 1) { + return all.get(0).get(); + } else { + AtomicReference ref = new AtomicReference<>(null); + boolean result = all.allMatch(p -> { + try { + return p.get(); + } catch (BindingsFoundException bve) { + ref.updateAndGet(rte -> { + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); + } else { + return rte == null || rte instanceof CycleException ? bve : rte; + } + }); + return true; + } catch (CycleException ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); + return true; + } + }); + RuntimeException exc = ref.get(); + if (exc instanceof BindingsFoundException) { + throw exc; + } else if (result && exc != null) { + throw exc; + } else { + return result; + } + } + }; } - @SuppressWarnings("unchecked") - public static final Supplier uni(V1 v1, V2 v2, V3 v3, V4 v4, Supplier predicate) { - Map vars = Map.of(Entry.of(v1, null), Entry.of(v2, null), Entry.of(v3, null), Entry.of(v4, null)); - return () -> doUni(vars, predicate); - } + // Unification - private static boolean doUni(Map vars, Supplier predicate) { + private static Supplier uni(Map vars, Supplier predicate) { try { - return run(vars, predicate); + return () -> run(vars, predicate); } catch (BindingsFoundException bve) { - return any(bve.bindings.map(vs -> () -> doUni(vars.putAll(vs), predicate))).get(); + return any(bve.bindings.map(vs -> uni(vars.putAll(vs), predicate))); } } @@ -646,12 +535,12 @@ public String getMessage() { @SuppressWarnings("rawtypes") public static final class CircularLogicException extends CycleException { - private static final long serialVersionUID = 293433487448006753L; + private static final long serialVersionUID = 293433487448006753L; - private final List> derived; - private final Pair current; + private final List derived; + private final TermImpl current; - private CircularLogicException(List> derived, Pair current) { + private CircularLogicException(List derived, TermImpl current) { this.derived = derived; this.current = current; } @@ -659,7 +548,7 @@ private CircularLogicException(List> derived, Pair> cycle = derived.sublist(0, i + 1).prepend(current); + List cycle = derived.sublist(0, i + 1).prepend(current); return "Circular Logic " + cycle.reverse().asList().toString().substring(4); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 0900d0e0..fa78e7f6 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -20,20 +20,17 @@ package org.modelingvalue.dclare.test; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; import java.util.concurrent.ThreadLocalRandom; -import java.util.function.Supplier; import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; import org.modelingvalue.dclare.Logic; -import org.modelingvalue.dclare.Logic.Is; -import org.modelingvalue.dclare.Logic.Rel2; -import org.modelingvalue.dclare.Logic.Relation1; -import org.modelingvalue.dclare.Logic.Relation2; +import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -47,82 +44,48 @@ void run(Runnable test) { universeTransaction.waitForEnd(); } - static void isTrue(Supplier bs) { - assertTrue(bs.get()); + static void isTrue(Term... goals) { + assertTrue(is(goals)); } - static void isFalse(Supplier bs) { - assertTrue(!bs.get()); + static void isFalse(Term... goals) { + assertFalse(is(goals)); } - static void isTrue(Is is) { - } - - static void isFalse(Is is) { - } - - interface Person extends Relation1 { + interface Person extends Term { } Person person(String name) { - return obj(Person.class, name); + return term(Person.class, name); } Person var(String name) { return Logic.var(Person.class, name); } - interface ParentChild extends Relation2 { + interface ParentChild extends Term { } ParentChild parentChild(Person parent, Person child) { - return obj(ParentChild.class, parent, child); + return term(ParentChild.class, parent, child); } - interface AncestorDescendent extends Relation2 { + interface AncestorDescendent extends Term { } AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { - return obj(AncestorDescendent.class, ancestor, descendent); + return term(AncestorDescendent.class, ancestor, descendent); } - @RepeatedTest(1024) + @RepeatedTest(1) public void test0() { run(() -> { - Person Carel = person("Carel"); - Person Jan = person("Jan"); - Person Wim = person("Wim"); - Person Joppe = person("Joppe"); - Person A = var("A"); // Ancestor Person D = var("D"); // Descendent Person R = var("R"); // Relative - fact(parentChild(Carel, Jan)); - fact(parentChild(Jan, Wim)); - fact(parentChild(Wim, Joppe)); - rule(ancestorDescendent(A, D), parentChild(A, D)); - rule(ancestorDescendent(A, D), R, ancestorDescendent(A, R), parentChild(R, D)); - - isTrue(is(ancestorDescendent(Carel, Joppe))); - - isFalse(is(ancestorDescendent(Wim, Carel))); - }); - } - - @RepeatedTest(1024) - public void test1() { - run(() -> { - Rel2 parent_child = rel2("PC"); - Rel2 ancestor_descendent = rel2("AD"); - - Person A = var("A"); // Ancestor - Person D = var("D"); // Descendent - Person R = var("R"); // Relative - - ancestor_descendent.rule(A, D, parent_child.is(A, D)); - ancestor_descendent.rule(A, D, uni(R, and(ancestor_descendent.is(A, R), parent_child.is(R, D)))); + rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); Person Carel = person("Carel"); Person Jan = person("Jan"); @@ -132,28 +95,28 @@ public void test1() { Person Heleen = person("Heleen"); Person Marijn = person("Marijn"); - parent_child.fact(Carel, Jan); - parent_child.fact(Jan, Wim); - parent_child.fact(Elske, Wim); - parent_child.fact(Wim, Joppe); - parent_child.fact(Heleen, Joppe); - parent_child.fact(Wim, Marijn); - parent_child.fact(Heleen, Marijn); + fact(parentChild(Carel, Jan)); + fact(parentChild(Jan, Wim)); + fact(parentChild(Elske, Wim)); + fact(parentChild(Wim, Joppe)); + fact(parentChild(Heleen, Joppe)); + fact(parentChild(Wim, Marijn)); + fact(parentChild(Heleen, Marijn)); - isTrue(parent_child.is(Heleen, Joppe)); - isTrue(parent_child.is(Jan, Wim)); + isTrue(parentChild(Heleen, Joppe)); + isTrue(parentChild(Jan, Wim)); - isFalse(parent_child.is(Marijn, Wim)); - isFalse(parent_child.is(Heleen, Wim)); - isFalse(parent_child.is(Wim, Wim)); + isFalse(parentChild(Marijn, Wim)); + isFalse(parentChild(Heleen, Wim)); + isFalse(parentChild(Wim, Wim)); - isTrue(ancestor_descendent.is(Wim, Marijn)); - isTrue(ancestor_descendent.is(Carel, Marijn)); + isTrue(ancestorDescendent(Wim, Marijn)); + isTrue(ancestorDescendent(Carel, Marijn)); - isFalse(ancestor_descendent.is(Marijn, Wim)); - isFalse(ancestor_descendent.is(Heleen, Wim)); - isFalse(ancestor_descendent.is(Joppe, Carel)); - isFalse(ancestor_descendent.is(Carel, Carel)); + isFalse(ancestorDescendent(Marijn, Wim)); + isFalse(ancestorDescendent(Heleen, Wim)); + isFalse(ancestorDescendent(Joppe, Carel)); + isFalse(ancestorDescendent(Carel, Carel)); }); } } From e63b467134bc67852d498bda1e57972a4be1efae Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 19 Nov 2024 17:07:35 +0100 Subject: [PATCH 083/179] structure ready --- .../java/org/modelingvalue/dclare/Logic.java | 172 +++++++++--------- 1 file changed, 87 insertions(+), 85 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 77c3d19e..67473c0e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -25,6 +25,7 @@ import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; import java.util.function.Supplier; import org.modelingvalue.collections.Collection; @@ -124,6 +125,25 @@ private static final Object[] unproxy(Class functor, Object[] args) { protected Class functor() { return (Class) get(0); } + + @SuppressWarnings({"unchecked", "rawtypes"}) + protected > R replace(Function replacer) { + Object[] array = toArray(); + boolean changed = false; + for (int i = 0; i < array.length; i++) { + Object old = array[i]; + if (array[i] instanceof AbstractTermImpl) { + array[i] = ((AbstractTermImpl) array[i]).replace(replacer); + } + array[i] = replacer.apply(array[i]); + if (old != array[i]) { + changed = true; + } + } + return (R) (changed ? term(array) : this); + } + + protected abstract AbstractTermImpl term(Object[] array); } @SuppressWarnings("rawtypes") @@ -157,11 +177,21 @@ private VarImpl(Class functor, String name) { super(functor, name); } + private VarImpl(Class functor, Object name) { + super(functor, name); + } + @Override @SuppressWarnings("unchecked") protected final F proxy() { return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Variable.class}, this); } + + @Override + @SuppressWarnings("unchecked") + protected VarImpl term(Object[] array) { + return new VarImpl(functor(), array[1]); + } } // Terms @@ -209,60 +239,46 @@ private void patterns(int i, Object[] array) { } } + @Override @SuppressWarnings("unchecked") protected TermImpl term(Object[] array) { return new TermImpl(functor(), Arrays.copyOfRange(array, 1, array.length)); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public Boolean get() { Set rules = RULES.get(Pair.of(functor(), length() - 1)); - Set empty = Set.of(); - Map vars = VARIABLES.get(); - Object[] in = toArray(); - Object[] out = toArray(); - for (int i = 0; i < in.length; i++) { - while (vars.containsKey(in[i])) { - Object v = vars.get(in[i]); - if (v == null) { - empty = empty.add(in[i]); - if (rules.isEmpty()) { - out[i] = null; - } - break; - } else { - out[i] = v; - in[i] = v; - } - } - } - TermImpl term = term(out); - Set set = rules.isEmpty() || empty.isEmpty() ? FACTS.get(term) : Set.of(); + TermImpl pattern = replace(e -> e instanceof VarImpl ? null : e); + Set set = rules.isEmpty() || pattern == this ? FACTS.get(pattern) : Set.of(); if (set.isEmpty()) { if (!rules.isEmpty()) { List pre = DERIVED.get(); - if (pre.contains(term)) { - throw new CircularLogicException(pre, term); + if (pre.contains(this)) { + throw new CircularLogicException(pre, this); } else { - // actualize rules - Boolean result = DERIVED.get(pre.prepend(term), any(rules)); + rules = rules.map(r -> { + List vars = r.term().variables(); + return r. replace(e -> { + int i = e instanceof VarImpl ? vars.index(e) : -1; + return i >= 0 ? get(i + 1) : e; + }); + }).asSet(); + Boolean result = DERIVED.get(pre.prepend(this), any(rules)); if (result) { - FACTS.force(term, Set::add, term); + FACTS.force(this, Set::add, this); } return result; } } else { return Boolean.FALSE; } - } else if (!empty.isEmpty()) { - Set em = empty; + } else if (pattern != this) { throw new BindingsFoundException(set.map(b -> { - Map vs = Map.of(); - for (int i = 0; i < b.length(); i++) { - Object vin = in[i]; - if (em.contains(vin)) { - vs = vs.put(vin, b.get(i)); + Map vs = Map.of(); + for (int i = 0; i < length(); i++) { + if (get(i) instanceof VarImpl) { + vs = vs.put((VarImpl) get(i), b.get(i)); } } return vs; @@ -271,20 +287,18 @@ public Boolean get() { return Boolean.TRUE; } } - }; - - private static final Context> VARIABLES = Context.of(Map.of()); - @SuppressWarnings("rawtypes") - private static boolean run(Map vars, Supplier predicate) { - Map pre = VARIABLES.get(); - Set cycle = vars.filter(kv -> kv.getValue() == null).map(Entry::getKey).filter(k -> pre.containsKey(k) && pre.get(k) == null).asSet(); - if (cycle.isEmpty()) { - return VARIABLES.get(pre.putAll(vars), predicate); - } else { - throw new CircularVariableException(cycle); + @SuppressWarnings("rawtypes") + protected List variables() { + List vars = List.of(); + for (int i = 0; i < length(); i++) { + if (get(i) instanceof VarImpl) { + vars.add((VarImpl) get(i)); + } + } + return vars; } - } + }; // Rules @@ -316,6 +330,11 @@ protected final Rule proxy() { return (Rule) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{Rule.class}, this); } + @SuppressWarnings("rawtypes") + protected final TermImpl term() { + return ((TermImpl) get(2)); + } + @Override @SuppressWarnings("rawtypes") public Boolean get() { @@ -370,12 +389,22 @@ protected GoalImpl term(Object[] array) { @SuppressWarnings("rawtypes") public Boolean get() { Set> set = Set.of(); - TermImpl ht = (TermImpl) get(0); + TermImpl ht = (TermImpl) get(1); while (ht.length() == 2) { set = set.add((TermImpl) ht.get(1)); ht = (TermImpl) ht.get(2); } - return uni(null, all(set)).get(); + return uni(variables().asMap(v -> Entry.of(v, null)), all(set)).get(); + } + + private Supplier uni(Map vars, Supplier predicate) { + return () -> { + try { + return predicate.get(); + } catch (BindingsFoundException bve) { + return any(bve.bindings.map(vs -> uni(vars.putAll(vs), predicate))).get(); + } + }; } } @@ -427,11 +456,11 @@ private static Supplier any(Collection> ter if (rte instanceof BindingsFoundException) { return ((BindingsFoundException) rte).merge(bve); } else { - return rte == null || rte instanceof CycleException ? bve : rte; + return rte == null || rte instanceof CircularLogicException ? bve : rte; } }); return false; - } catch (CycleException ce) { + } catch (CircularLogicException ce) { ref.updateAndGet(rte -> rte == null ? ce : rte); return false; } @@ -467,11 +496,11 @@ private static Supplier all(Collection> ter if (rte instanceof BindingsFoundException) { return ((BindingsFoundException) rte).merge(bve); } else { - return rte == null || rte instanceof CycleException ? bve : rte; + return rte == null || rte instanceof CircularLogicException ? bve : rte; } }); return true; - } catch (CycleException ce) { + } catch (CircularLogicException ce) { ref.updateAndGet(rte -> rte == null ? ce : rte); return true; } @@ -488,24 +517,16 @@ private static Supplier all(Collection> ter }; } - // Unification - - private static Supplier uni(Map vars, Supplier predicate) { - try { - return () -> run(vars, predicate); - } catch (BindingsFoundException bve) { - return any(bve.bindings.map(vs -> uni(vars.putAll(vs), predicate))); - } - } - // Runtime Exceptions public static final class BindingsFoundException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; + private static final long serialVersionUID = 4505117271488648346L; - private final Set> bindings; + @SuppressWarnings("rawtypes") + private final Set> bindings; - private BindingsFoundException(Set> bindings) { + @SuppressWarnings("rawtypes") + private BindingsFoundException(Set> bindings) { this.bindings = bindings; } @@ -514,27 +535,8 @@ private BindingsFoundException merge(BindingsFoundException other) { } } - private static abstract class CycleException extends RuntimeException { - private static final long serialVersionUID = -1561492438458671302L; - } - - public static final class CircularVariableException extends CycleException { - private static final long serialVersionUID = 1636584651815799600L; - - private final Set vars; - - private CircularVariableException(Set vars) { - this.vars = vars; - } - - @Override - public String getMessage() { - return "Circular Variables " + vars.toString().substring(3); - } - } - @SuppressWarnings("rawtypes") - public static final class CircularLogicException extends CycleException { + public static final class CircularLogicException extends RuntimeException { private static final long serialVersionUID = 293433487448006753L; private final List derived; From 17e5b1456a429a797d32499fee7b24ed33c6d8d2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 19 Nov 2024 17:48:43 +0100 Subject: [PATCH 084/179] better --- .../java/org/modelingvalue/dclare/Logic.java | 168 +++++++++--------- 1 file changed, 85 insertions(+), 83 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 67473c0e..bb593fa8 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -29,7 +29,6 @@ import java.util.function.Supplier; import org.modelingvalue.collections.Collection; -import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; @@ -254,17 +253,17 @@ public Boolean get() { if (set.isEmpty()) { if (!rules.isEmpty()) { List pre = DERIVED.get(); - if (pre.contains(this)) { - throw new CircularLogicException(pre, this); + if (pre.contains(pattern)) { + throw new CircularLogicException(pre, pattern); } else { - rules = rules.map(r -> { + Set bound = rules.map(r -> { List vars = r.term().variables(); return r. replace(e -> { int i = e instanceof VarImpl ? vars.index(e) : -1; return i >= 0 ? get(i + 1) : e; }); }).asSet(); - Boolean result = DERIVED.get(pre.prepend(this), any(rules)); + Boolean result = DERIVED.get(pre.prepend(pattern), () -> any(bound)); if (result) { FACTS.force(this, Set::add, this); } @@ -385,26 +384,33 @@ protected GoalImpl term(Object[] array) { return new GoalImpl(array[1]); } - @Override @SuppressWarnings("rawtypes") + @Override public Boolean get() { + try { + return all(goals()); + } catch (BindingsFoundException bve) { + return any(bve.bindings.map(b -> replace(e -> { + if (e instanceof VarImpl) { + Object v = b.get((VarImpl) e); + if (v != null) { + return v; + } + } + return e; + }))); + } + } + + @SuppressWarnings("rawtypes") + private Set> goals() { Set> set = Set.of(); TermImpl ht = (TermImpl) get(1); while (ht.length() == 2) { set = set.add((TermImpl) ht.get(1)); ht = (TermImpl) ht.get(2); } - return uni(variables().asMap(v -> Entry.of(v, null)), all(set)).get(); - } - - private Supplier uni(Map vars, Supplier predicate) { - return () -> { - try { - return predicate.get(); - } catch (BindingsFoundException bve) { - return any(bve.bindings.map(vs -> uni(vars.putAll(vs), predicate))).get(); - } - }; + return set; } } @@ -439,82 +445,78 @@ public static void fact(Term term) { // Any @SuppressWarnings({"rawtypes", "unchecked"}) - private static Supplier any(Collection> terms) { + private static Boolean any(Collection> terms) { List> any = terms.random().asList(); - return () -> { - if (any.isEmpty()) { - return false; - } else if (any.size() == 1) { - return any.get(0).get(); - } else { - AtomicReference ref = new AtomicReference<>(null); - boolean result = any.anyMatch(t -> { - try { - return t.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CircularLogicException ? bve : rte; - } - }); - return false; - } catch (CircularLogicException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return false; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (!result && exc != null) { - throw exc; - } else { - return result; + if (any.isEmpty()) { + return false; + } else if (any.size() == 1) { + return any.get(0).get(); + } else { + AtomicReference ref = new AtomicReference<>(null); + boolean result = any.anyMatch(t -> { + try { + return t.get(); + } catch (BindingsFoundException bve) { + ref.updateAndGet(rte -> { + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); + } else { + return rte == null || rte instanceof CircularLogicException ? bve : rte; + } + }); + return false; + } catch (CircularLogicException ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); + return false; } + }); + RuntimeException exc = ref.get(); + if (exc instanceof BindingsFoundException) { + throw exc; + } else if (!result && exc != null) { + throw exc; + } else { + return result; } - }; + } } // All - private static Supplier all(Collection> terms) { + private static Boolean all(Collection> terms) { List> all = terms.random().asList(); - return () -> { - if (all.isEmpty()) { - return true; - } else if (all.size() == 1) { - return all.get(0).get(); - } else { - AtomicReference ref = new AtomicReference<>(null); - boolean result = all.allMatch(p -> { - try { - return p.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CircularLogicException ? bve : rte; - } - }); - return true; - } catch (CircularLogicException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return true; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (result && exc != null) { - throw exc; - } else { - return result; + if (all.isEmpty()) { + return true; + } else if (all.size() == 1) { + return all.get(0).get(); + } else { + AtomicReference ref = new AtomicReference<>(null); + boolean result = all.allMatch(p -> { + try { + return p.get(); + } catch (BindingsFoundException bve) { + ref.updateAndGet(rte -> { + if (rte instanceof BindingsFoundException) { + return ((BindingsFoundException) rte).merge(bve); + } else { + return rte == null || rte instanceof CircularLogicException ? bve : rte; + } + }); + return true; + } catch (CircularLogicException ce) { + ref.updateAndGet(rte -> rte == null ? ce : rte); + return true; } + }); + RuntimeException exc = ref.get(); + if (exc instanceof BindingsFoundException) { + throw exc; + } else if (result && exc != null) { + throw exc; + } else { + return result; } - }; + } } // Runtime Exceptions From 9e103aa7a8488a5550a5efabf077e6f6fd0abe87 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 22 Nov 2024 14:39:23 +0100 Subject: [PATCH 085/179] cleanup --- .../java/org/modelingvalue/dclare/Logic.java | 349 +++++++----------- .../modelingvalue/dclare/test/LogicTest.java | 28 ++ 2 files changed, 152 insertions(+), 225 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index bb593fa8..79a37af9 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -24,11 +24,11 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; +import java.util.function.BiFunction; import java.util.function.Supplier; import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; @@ -41,15 +41,26 @@ private Logic() { } @SuppressWarnings("rawtypes") - private static final Context> DERIVED = Context.of(List.of()); + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + + private static final BiFunction, RuleImpl, Set> ADD_RULE = (s, e) -> s == null ? Set.of(e) : s.add(e); + + @SuppressWarnings("rawtypes") + private static final Context> DERIVED = Context.of(List.of()); + + @SuppressWarnings("rawtypes") + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + + @SuppressWarnings("rawtypes") + private static final Constant, Set> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", Set.of(), CoreSetableModifier.durable); + private static final Pair, Collection>> EMPTY = Pair.of(Set.of(), Set.of()); @SuppressWarnings("rawtypes") - private static final Constant, Set> RULES = Constant.of("RULES", Set.of(), CoreSetableModifier.durable); + private static final Pair>, Collection>> EMPTY_VARS = Pair.of(Set.of(), Set.of()); - private static abstract class AbstractTermImpl extends StructImpl implements InvocationHandler { + private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; private static final Method EQUALS; @@ -92,10 +103,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl public String toString() { if (functor() == L.class) { List list = List.of(); - AbstractTermImpl ht = this; - while (ht.length() == 2) { + ClauseImpl ht = this; + while (ht.length() == 3) { list = list.prepend(ht.get(1)); - ht = (AbstractTermImpl) ht.get(2); + ht = (ClauseImpl) ht.get(2); } return list.toString().substring(4); } else { @@ -104,7 +115,7 @@ public String toString() { } } - protected AbstractTermImpl(Class functor, Object... args) { + protected ClauseImpl(Class functor, Object... args) { super(unproxy(functor, args)); } @@ -125,24 +136,7 @@ protected Class functor() { return (Class) get(0); } - @SuppressWarnings({"unchecked", "rawtypes"}) - protected > R replace(Function replacer) { - Object[] array = toArray(); - boolean changed = false; - for (int i = 0; i < array.length; i++) { - Object old = array[i]; - if (array[i] instanceof AbstractTermImpl) { - array[i] = ((AbstractTermImpl) array[i]).replace(replacer); - } - array[i] = replacer.apply(array[i]); - if (old != array[i]) { - changed = true; - } - } - return (R) (changed ? term(array) : this); - } - - protected abstract AbstractTermImpl term(Object[] array); + protected abstract ClauseImpl term(Object[] array); } @SuppressWarnings("rawtypes") @@ -169,7 +163,7 @@ public static F var(Class functor, String id) { return new VarImpl(functor, id).proxy(); } - private static final class VarImpl extends AbstractTermImpl { + private static final class VarImpl extends ClauseImpl { private static final long serialVersionUID = -8998368070388908726L; private VarImpl(Class functor, String name) { @@ -186,6 +180,11 @@ protected final F proxy() { return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Variable.class}, this); } + @Override + public String toString() { + return get(1).toString(); + } + @Override @SuppressWarnings("unchecked") protected VarImpl term(Object[] array) { @@ -200,10 +199,10 @@ public static interface Term { @SuppressWarnings("unchecked") public static F term(Class functor, Object... args) { - return new TermImpl(functor).proxy(); + return new TermImpl(functor, args).proxy(); } - private static class TermImpl extends AbstractTermImpl implements Supplier { + private static class TermImpl extends ClauseImpl { private static final long serialVersionUID = -1605559565948158856L; private TermImpl(Class functor, Object... args) { @@ -216,9 +215,15 @@ protected F proxy() { return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Term.class}, this); } + @Override + @SuppressWarnings("unchecked") + protected TermImpl term(Object[] array) { + return new TermImpl((Class) array[0], Arrays.copyOfRange(array, 1, array.length)); + } + @SuppressWarnings("rawtypes") protected final void makeFact() { - FACTS.force(this, Set::add, this); + FACTS.force(this, ADD_FACT, this); patterns(1, toArray()); } @@ -227,76 +232,88 @@ private void patterns(int i, Object[] array) { array = array.clone(); if (array[i] == null) { array[i] = get(i); - FACTS.force(term(array), Set::add, this); + FACTS.force(term(array), ADD_FACT, this); } patterns(i + 1, array); if (array[i] != null) { array[i] = null; - FACTS.force(term(array), Set::add, this); + FACTS.force(term(array), ADD_FACT, this); } patterns(i + 1, array); } } - @Override - @SuppressWarnings("unchecked") - protected TermImpl term(Object[] array) { - return new TermImpl(functor(), Arrays.copyOfRange(array, 1, array.length)); + @SuppressWarnings({"rawtypes", "unchecked"}) + protected Set variables() { + Set vars = Set.of(); + for (int i = 0; i < length(); i++) { + if (get(i) instanceof VarImpl) { + vars = vars.add((VarImpl) get(i)); + } + } + return vars; + } + + @SuppressWarnings("rawtypes") + protected Map getBinding(TermImpl term) { + Map vars = Map.of(); + for (int i = 1; i < length(); i++) { + if (get(i) instanceof VarImpl) { + vars = vars.put((VarImpl) get(i), term.get(i)); + } + } + return vars; + } + + @SuppressWarnings("rawtypes") + protected TermImpl setBinding(Map vars) { + Object[] array = toArray(); + for (int i = 1; i < length(); i++) { + if (get(i) instanceof VarImpl) { + array[i] = vars.get((VarImpl) get(i)); + } + } + return term(array); } @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - public Boolean get() { - Set rules = RULES.get(Pair.of(functor(), length() - 1)); - TermImpl pattern = replace(e -> e instanceof VarImpl ? null : e); - Set set = rules.isEmpty() || pattern == this ? FACTS.get(pattern) : Set.of(); - if (set.isEmpty()) { - if (!rules.isEmpty()) { + protected Pair, Collection>> match() { + Set facts = FACTS.get(this); + if (facts == null) { + Set rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { List pre = DERIVED.get(); - if (pre.contains(pattern)) { - throw new CircularLogicException(pre, pattern); + if (pre.contains(this)) { + return Pair.of(Set.of(), Set.of(() -> { + int i = pre.firstIndexOf(this); + List cycle = pre.sublist(0, i + 1).prepend(this); + return "Circular Logic " + cycle.reverse().asList().toString().substring(4); + })); } else { - Set bound = rules.map(r -> { - List vars = r.term().variables(); - return r. replace(e -> { - int i = e instanceof VarImpl ? vars.index(e) : -1; - return i >= 0 ? get(i + 1) : e; - }); - }).asSet(); - Boolean result = DERIVED.get(pre.prepend(pattern), () -> any(bound)); - if (result) { - FACTS.force(this, Set::add, this); + List post = pre.prepend(this); + Pair, Collection>> result = DERIVED.get(post, () -> { + Pair, Collection>> r = EMPTY; + for (RuleImpl rule : rules) { + Pair, Collection>> e = rule.eval(this); + r = Pair.of(Collection.concat(r.a(), e.a()), Collection.concat(r.b(), e.b())); + } + return r; + }); + if (result.b().isEmpty()) { + facts = result.a().asSet(); + FACTS.force(this, facts); + return Pair.of(facts, Set.of()); + } else { + return result; } - return result; } } else { - return Boolean.FALSE; + return EMPTY; } - } else if (pattern != this) { - throw new BindingsFoundException(set.map(b -> { - Map vs = Map.of(); - for (int i = 0; i < length(); i++) { - if (get(i) instanceof VarImpl) { - vs = vs.put((VarImpl) get(i), b.get(i)); - } - } - return vs; - }).asSet()); } else { - return Boolean.TRUE; + return Pair.of(facts, Set.of()); } } - - @SuppressWarnings("rawtypes") - protected List variables() { - List vars = List.of(); - for (int i = 0; i < length(); i++) { - if (get(i) instanceof VarImpl) { - vars.add((VarImpl) get(i)); - } - } - return vars; - } }; // Rules @@ -308,7 +325,7 @@ public static interface Rule extends Term { public static Rule rule(Term term, Term... goals) { RuleImpl ruleImpl = new RuleImpl(term, goal(goals)); TermImpl termImpl = unproxy(term); - RULES.force(Pair.of(termImpl.functor(), termImpl.length() - 1), Set::add, ruleImpl); + RULES.force(Pair.of(termImpl.functor(), termImpl.length() - 1), ADD_RULE, ruleImpl); return ruleImpl.proxy(); } @@ -331,13 +348,19 @@ protected final Rule proxy() { @SuppressWarnings("rawtypes") protected final TermImpl term() { - return ((TermImpl) get(2)); + return ((TermImpl) get(1)); } - @Override @SuppressWarnings("rawtypes") - public Boolean get() { - return ((GoalImpl) get(2)).get(); + protected final GoalImpl goal() { + return ((GoalImpl) get(2)); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + protected Pair, Collection>> eval(TermImpl ptrn) { + TermImpl head = term(); + Pair>, Collection>> result = goal().eval(head.getBinding(ptrn)); + return Pair.of(result.a().map(m -> head.setBinding(m)), result.b()); } @Override @@ -353,7 +376,9 @@ public static interface Goal extends Term { } public static boolean is(Term... goals) { - return new GoalImpl(l(goals)).get(); + @SuppressWarnings("rawtypes") + Pair>, Collection>> result = new GoalImpl(l(goals)).eval(); + return result.b().isEmpty() && !result.a().isEmpty(); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -385,32 +410,21 @@ protected GoalImpl term(Object[] array) { } @SuppressWarnings("rawtypes") - @Override - public Boolean get() { - try { - return all(goals()); - } catch (BindingsFoundException bve) { - return any(bve.bindings.map(b -> replace(e -> { - if (e instanceof VarImpl) { - Object v = b.get((VarImpl) e); - if (v != null) { - return v; - } - } - return e; - }))); - } + public Pair>, Collection>> eval() { + return eval(variables().asMap(v -> Entry.of(v, null))); } - @SuppressWarnings("rawtypes") - private Set> goals() { - Set> set = Set.of(); - TermImpl ht = (TermImpl) get(1); - while (ht.length() == 2) { - set = set.add((TermImpl) ht.get(1)); - ht = (TermImpl) ht.get(2); + @SuppressWarnings({"rawtypes", "unchecked"}) + protected Pair>, Collection>> eval(Map vars) { + Pair>, Collection>> r = EMPTY_VARS; + TermImpl list = (TermImpl) get(1); + while (list.length() == 3) { + TermImpl goal = (TermImpl) list.get(1); + Pair, Collection>> e = goal.setBinding(vars).match(); + r = Pair.of(Collection.concat(r.a(), e.a().map(m -> goal.getBinding(m))), Collection.concat(r.b(), e.b())); + list = (TermImpl) list.get(2); } - return set; + return r; } } @@ -442,119 +456,4 @@ public static void fact(Term term) { unproxy(term).makeFact(); } - // Any - - @SuppressWarnings({"rawtypes", "unchecked"}) - private static Boolean any(Collection> terms) { - List> any = terms.random().asList(); - if (any.isEmpty()) { - return false; - } else if (any.size() == 1) { - return any.get(0).get(); - } else { - AtomicReference ref = new AtomicReference<>(null); - boolean result = any.anyMatch(t -> { - try { - return t.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CircularLogicException ? bve : rte; - } - }); - return false; - } catch (CircularLogicException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return false; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (!result && exc != null) { - throw exc; - } else { - return result; - } - } - } - - // All - - private static Boolean all(Collection> terms) { - List> all = terms.random().asList(); - if (all.isEmpty()) { - return true; - } else if (all.size() == 1) { - return all.get(0).get(); - } else { - AtomicReference ref = new AtomicReference<>(null); - boolean result = all.allMatch(p -> { - try { - return p.get(); - } catch (BindingsFoundException bve) { - ref.updateAndGet(rte -> { - if (rte instanceof BindingsFoundException) { - return ((BindingsFoundException) rte).merge(bve); - } else { - return rte == null || rte instanceof CircularLogicException ? bve : rte; - } - }); - return true; - } catch (CircularLogicException ce) { - ref.updateAndGet(rte -> rte == null ? ce : rte); - return true; - } - }); - RuntimeException exc = ref.get(); - if (exc instanceof BindingsFoundException) { - throw exc; - } else if (result && exc != null) { - throw exc; - } else { - return result; - } - } - } - - // Runtime Exceptions - - public static final class BindingsFoundException extends RuntimeException { - private static final long serialVersionUID = 4505117271488648346L; - - @SuppressWarnings("rawtypes") - private final Set> bindings; - - @SuppressWarnings("rawtypes") - private BindingsFoundException(Set> bindings) { - this.bindings = bindings; - } - - private BindingsFoundException merge(BindingsFoundException other) { - return new BindingsFoundException(bindings.addAll(other.bindings)); - } - } - - @SuppressWarnings("rawtypes") - public static final class CircularLogicException extends RuntimeException { - private static final long serialVersionUID = 293433487448006753L; - - private final List derived; - private final TermImpl current; - - private CircularLogicException(List derived, TermImpl current) { - this.derived = derived; - this.current = current; - } - - @Override - public String getMessage() { - int i = derived.firstIndexOf(current); - List cycle = derived.sublist(0, i + 1).prepend(current); - return "Circular Logic " + cycle.reverse().asList().toString().substring(4); - } - } - } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index fa78e7f6..f8def999 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -119,4 +119,32 @@ public void test0() { isFalse(ancestorDescendent(Carel, Carel)); }); } + + @RepeatedTest(1) + public void test1() { + run(() -> { + Person A = var("A"); // Ancestor + Person D = var("D"); // Descendent + Person R = var("R"); // Relative + + rule(ancestorDescendent(A, D), parentChild(A, D)); + rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); + + Person Carel = person("Carel"); + Person Jan = person("Jan"); + Person Wim = person("Wim"); + + fact(parentChild(Carel, Jan)); + fact(parentChild(Jan, Wim)); + + isTrue(parentChild(Carel, Jan)); + isTrue(parentChild(Jan, Wim)); + + isFalse(parentChild(Jan, Carel)); + isFalse(parentChild(Wim, Wim)); + + isTrue(ancestorDescendent(Carel, Jan)); + isTrue(ancestorDescendent(Carel, Wim)); + }); + } } From 5d7c9d0531548ba1099c5b5ef1f0aa1ae4bee4b6 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sat, 23 Nov 2024 13:18:33 +0100 Subject: [PATCH 086/179] simplified --- .../java/org/modelingvalue/dclare/Logic.java | 119 +++++++++--------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 79a37af9..72fab3d8 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -25,10 +25,8 @@ import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.function.BiFunction; -import java.util.function.Supplier; import org.modelingvalue.collections.Collection; -import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; @@ -41,24 +39,18 @@ private Logic() { } @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - private static final BiFunction, RuleImpl, Set> ADD_RULE = (s, e) -> s == null ? Set.of(e) : s.add(e); + private static final BiFunction, RuleImpl, Set> ADD_RULE = (s, e) -> s == null ? Set.of(e) : s.add(e); @SuppressWarnings("rawtypes") - private static final Context> DERIVED = Context.of(List.of()); + private static final Context> DERIVED = Context.of(List.of()); @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant, Set> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); - - @SuppressWarnings("rawtypes") - private static final Pair, Collection>> EMPTY = Pair.of(Set.of(), Set.of()); - - @SuppressWarnings("rawtypes") - private static final Pair>, Collection>> EMPTY_VARS = Pair.of(Set.of(), Set.of()); + private static final Constant, Set> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -148,9 +140,9 @@ private static final Object unproxy(Object object) { } } - @SuppressWarnings("rawtypes") - private static final TermImpl unproxy(Term object) { - return (TermImpl) Proxy.getInvocationHandler(object); + @SuppressWarnings("unchecked") + private static final TermImpl unproxy(T object) { + return (TermImpl) Proxy.getInvocationHandler(object); } // Variables @@ -244,11 +236,13 @@ private void patterns(int i, Object[] array) { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set variables() { - Set vars = Set.of(); - for (int i = 0; i < length(); i++) { + protected Map variables() { + Map vars = Map.of(); + for (int i = 1; i < length(); i++) { if (get(i) instanceof VarImpl) { - vars = vars.add((VarImpl) get(i)); + vars = vars.put((VarImpl) get(i), null); + } else if (get(i) instanceof TermImpl) { + vars = vars.putAll(((TermImpl) get(i)).variables()); } } return vars; @@ -277,41 +271,28 @@ protected TermImpl setBinding(Map vars) { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Pair, Collection>> match() { + protected Collection match() { Set facts = FACTS.get(this); if (facts == null) { Set rules = RULES.get(Pair.of(functor(), length() - 1)); if (rules != null) { List pre = DERIVED.get(); if (pre.contains(this)) { - return Pair.of(Set.of(), Set.of(() -> { - int i = pre.firstIndexOf(this); - List cycle = pre.sublist(0, i + 1).prepend(this); - return "Circular Logic " + cycle.reverse().asList().toString().substring(4); - })); + return Set.of(INCOMPLETE); } else { - List post = pre.prepend(this); - Pair, Collection>> result = DERIVED.get(post, () -> { - Pair, Collection>> r = EMPTY; + return DERIVED.get(pre.prepend(this), () -> { + Collection r = Set.of(); for (RuleImpl rule : rules) { - Pair, Collection>> e = rule.eval(this); - r = Pair.of(Collection.concat(r.a(), e.a()), Collection.concat(r.b(), e.b())); + r = Collection.concat(r, rule.eval(this)); } return r; }); - if (result.b().isEmpty()) { - facts = result.a().asSet(); - FACTS.force(this, facts); - return Pair.of(facts, Set.of()); - } else { - return result; - } } } else { - return EMPTY; + return Set.of(); } } else { - return Pair.of(facts, Set.of()); + return facts; } } }; @@ -357,10 +338,10 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Pair, Collection>> eval(TermImpl ptrn) { + protected Collection eval(TermImpl ptrn) { TermImpl head = term(); - Pair>, Collection>> result = goal().eval(head.getBinding(ptrn)); - return Pair.of(result.a().map(m -> head.setBinding(m)), result.b()); + Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn))); + return r.map(m -> head.setBinding(m)); } @Override @@ -376,14 +357,12 @@ public static interface Goal extends Term { } public static boolean is(Term... goals) { - @SuppressWarnings("rawtypes") - Pair>, Collection>> result = new GoalImpl(l(goals)).eval(); - return result.b().isEmpty() && !result.a().isEmpty(); + return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); } @SuppressWarnings({"unchecked", "rawtypes"}) public static Goal goal(Term... goals) { - return new GoalImpl(l(goals)).proxy(); + return new GoalImpl(list(goals)).proxy(); } private static final class GoalImpl extends TermImpl { @@ -410,24 +389,45 @@ protected GoalImpl term(Object[] array) { } @SuppressWarnings("rawtypes") - public Pair>, Collection>> eval() { - return eval(variables().asMap(v -> Entry.of(v, null))); + public Collection> eval() { + return eval(variables()); } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Pair>, Collection>> eval(Map vars) { - Pair>, Collection>> r = EMPTY_VARS; + protected Collection> eval(Map vars) { + Collection> r = Set.of(vars); TermImpl list = (TermImpl) get(1); while (list.length() == 3) { TermImpl goal = (TermImpl) list.get(1); - Pair, Collection>> e = goal.setBinding(vars).match(); - r = Pair.of(Collection.concat(r.a(), e.a().map(m -> goal.getBinding(m))), Collection.concat(r.b(), e.b())); + r = r.flatMap(vs -> { + Collection ts = goal.setBinding(vs).match(); + Collection> ms = ts.map(t -> vs.putAll(goal.getBinding(t))); + return ms; + }); list = (TermImpl) list.get(2); } return r; } } + // Incomplete + + public interface Incomplete { + } + + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); + private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + + @SuppressWarnings("unchecked") + public static Incomplete incomplete() { + return INCOMPLETE.proxy(); + } + + @SuppressWarnings("unchecked") + public static Incomplete incompleteVar() { + return INCOMPLETE_VAR.proxy(); + } + // Lists public interface L { @@ -439,13 +439,18 @@ public static L l(E head, L tail) { } @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST = term(L.class); + private static final TermImpl EMPTY_LIST = new TermImpl(L.class); - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public static L l(E... es) { - L l = EMPTY_LIST; + return list(es).proxy(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static TermImpl list(E... es) { + TermImpl l = EMPTY_LIST; for (int i = es.length - 1; i >= 0; i--) { - l = l(es[i], l); + l = new TermImpl(L.class, unproxy(es[i]), l); } return l; } From 9c83cef3f769917da2fbfc42cfb4334ec13a9cf5 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sun, 24 Nov 2024 13:26:49 +0100 Subject: [PATCH 087/179] working --- .../java/org/modelingvalue/dclare/Logic.java | 141 +++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 4 +- 2 files changed, 109 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 72fab3d8..cd1f0e76 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.function.BiFunction; -import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; @@ -250,28 +250,36 @@ protected Map variables() { @SuppressWarnings("rawtypes") protected Map getBinding(TermImpl term) { - Map vars = Map.of(); - for (int i = 1; i < length(); i++) { - if (get(i) instanceof VarImpl) { - vars = vars.put((VarImpl) get(i), term.get(i)); + if (term == INCOMPLETE) { + return INCOMPLETE_MAP; + } else { + Map vars = Map.of(); + for (int i = 1; i < length(); i++) { + if (get(i) instanceof VarImpl) { + vars = vars.put((VarImpl) get(i), term.get(i)); + } } + return vars; } - return vars; } @SuppressWarnings("rawtypes") - protected TermImpl setBinding(Map vars) { - Object[] array = toArray(); - for (int i = 1; i < length(); i++) { - if (get(i) instanceof VarImpl) { - array[i] = vars.get((VarImpl) get(i)); + protected TermImpl setBinding(Map vars) { + if (vars == INCOMPLETE_MAP) { + return INCOMPLETE; + } else { + Object[] array = toArray(); + for (int i = 1; i < length(); i++) { + if (get(i) instanceof VarImpl) { + array[i] = vars.get((VarImpl) get(i)); + } } + return term(array); } - return term(array); } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match() { + protected Set match() { Set facts = FACTS.get(this); if (facts == null) { Set rules = RULES.get(Pair.of(functor(), length() - 1)); @@ -280,13 +288,15 @@ protected Collection match() { if (pre.contains(this)) { return Set.of(INCOMPLETE); } else { - return DERIVED.get(pre.prepend(this), () -> { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - r = Collection.concat(r, rule.eval(this)); + Set result = DERIVED.get(pre.prepend(this), () -> { + Set r = Set.of(); + for (RuleImpl rule : rules.random()) { + r = r.addAll(rule.eval(this)); } return r; }); + FACTS.force(this, result); + return result; } } else { return Set.of(); @@ -295,6 +305,41 @@ protected Collection match() { return facts; } } + + @SuppressWarnings("rawtypes") + protected int prio() { + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); + } else { + Set rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { + return nrOfNulls(); + } + } + return Integer.MIN_VALUE; + } + + @SuppressWarnings("rawtypes") + protected List list() { + List l = List.of(); + TermImpl t = this; + while (t.length() == 3) { + l = l.add((TermImpl) t.get(1)); + t = (TermImpl) t.get(2); + } + return l; + } + + protected int nrOfNulls() { + int nr = 0; + for (int i = 1; i < length(); i++) { + if (get(i) == null) { + nr++; + } + } + return nr; + } }; // Rules @@ -338,10 +383,10 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection eval(TermImpl ptrn) { + protected Set eval(TermImpl ptrn) { TermImpl head = term(); - Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn))); - return r.map(m -> head.setBinding(m)); + Set> r = goal().eval(variables().putAll(head.getBinding(ptrn))); + return r.map(m -> head.setBinding(m)).asSet(); } @Override @@ -389,24 +434,50 @@ protected GoalImpl term(Object[] array) { } @SuppressWarnings("rawtypes") - public Collection> eval() { + public Set> eval() { return eval(variables()); } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection> eval(Map vars) { - Collection> r = Set.of(vars); - TermImpl list = (TermImpl) get(1); - while (list.length() == 3) { - TermImpl goal = (TermImpl) list.get(1); - r = r.flatMap(vs -> { - Collection ts = goal.setBinding(vs).match(); - Collection> ms = ts.map(t -> vs.putAll(goal.getBinding(t))); - return ms; - }); - list = (TermImpl) list.get(2); + protected Set> eval(Map vars) { + List list = ((TermImpl) get(1)).list(); + return eval(list, list, Set.of(vars)); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + private Set> eval(List goals, List actual, Set> vars) { + if (goals.isEmpty()) { + return vars; + } else { + return vars.> flatMap(v -> { + List b = actual; + for (int i = 0; i < goals.size(); i++) { + b = b.replace(i, goals.get(i).setBinding(v)); + } + TermImpl f = first(b); + int i = b.index(f); + TermImpl g = goals.get(i); + Set m = f.match(); + return eval(goals.removeIndex(i), b.removeIndex(i), m.map(t -> { + Map pa = v.putAll(g.getBinding(t)); + return pa; + }).asSet()); + }).asSet(); + } + } + + @SuppressWarnings("rawtypes") + private static TermImpl first(List list) { + TermImpl first = null; + int min = Integer.MAX_VALUE; + for (TermImpl t : list) { + int prio = t.prio(); + if (first == null || prio < min) { + first = t; + min = prio; + } } - return r; + return first; } } @@ -415,8 +486,10 @@ protected Collection> eval(Map vars) { public interface Incomplete { } - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); + @SuppressWarnings("rawtypes") + private static final Map INCOMPLETE_MAP = Map.of(Entry.of(INCOMPLETE_VAR, INCOMPLETE)); @SuppressWarnings("unchecked") public static Incomplete incomplete() { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index f8def999..b9f91ecc 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -77,7 +77,7 @@ AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(AncestorDescendent.class, ancestor, descendent); } - @RepeatedTest(1) + @RepeatedTest(10) public void test0() { run(() -> { Person A = var("A"); // Ancestor @@ -120,7 +120,7 @@ public void test0() { }); } - @RepeatedTest(1) + @RepeatedTest(10) public void test1() { run(() -> { Person A = var("A"); // Ancestor From 122c1f1d179b9045d8c9664c5cf4c3816bdd73ac Mon Sep 17 00:00:00 2001 From: WimBast Date: Sun, 24 Nov 2024 13:36:10 +0100 Subject: [PATCH 088/179] simplification --- .../java/org/modelingvalue/dclare/Logic.java | 29 +++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 4 +-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index cd1f0e76..b9cb0aff 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -440,25 +440,24 @@ public Set> eval() { @SuppressWarnings({"rawtypes", "unchecked"}) protected Set> eval(Map vars) { - List list = ((TermImpl) get(1)).list(); - return eval(list, list, Set.of(vars)); + return eval(((TermImpl) get(1)).list(), Set.of(vars)); } @SuppressWarnings({"rawtypes", "unchecked"}) - private Set> eval(List goals, List actual, Set> vars) { + private Set> eval(List goals, Set> vars) { if (goals.isEmpty()) { return vars; } else { return vars.> flatMap(v -> { - List b = actual; - for (int i = 0; i < goals.size(); i++) { - b = b.replace(i, goals.get(i).setBinding(v)); + List actual = List.of(); + for (TermImpl g : goals) { + actual = actual.add(g.setBinding(v)); } - TermImpl f = first(b); - int i = b.index(f); + int i = first(actual); + TermImpl f = actual.get(i); TermImpl g = goals.get(i); Set m = f.match(); - return eval(goals.removeIndex(i), b.removeIndex(i), m.map(t -> { + return eval(goals.removeIndex(i), m.map(t -> { Map pa = v.putAll(g.getBinding(t)); return pa; }).asSet()); @@ -467,13 +466,13 @@ private Set> eval(List goals, List actu } @SuppressWarnings("rawtypes") - private static TermImpl first(List list) { - TermImpl first = null; + private static int first(List list) { + int first = -1; int min = Integer.MAX_VALUE; - for (TermImpl t : list) { - int prio = t.prio(); - if (first == null || prio < min) { - first = t; + for (int i = 0; i < list.size(); i++) { + int prio = list.get(i).prio(); + if (first == -1 || prio < min) { + first = i; min = prio; } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index b9f91ecc..e7c9181b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -77,7 +77,7 @@ AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(AncestorDescendent.class, ancestor, descendent); } - @RepeatedTest(10) + @RepeatedTest(100) public void test0() { run(() -> { Person A = var("A"); // Ancestor @@ -120,7 +120,7 @@ public void test0() { }); } - @RepeatedTest(10) + @RepeatedTest(100) public void test1() { run(() -> { Person A = var("A"); // Ancestor From 56e23a7a61d84d9fae802cc6d5fdb4b7f2dd07e3 Mon Sep 17 00:00:00 2001 From: WimBast Date: Sun, 24 Nov 2024 13:44:47 +0100 Subject: [PATCH 089/179] lazy Collections --- .../java/org/modelingvalue/dclare/Logic.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index b9cb0aff..09cc6fec 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.function.BiFunction; +import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.List; import org.modelingvalue.collections.Map; @@ -279,7 +280,7 @@ protected TermImpl setBinding(Map vars) { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set match() { + protected Collection match() { Set facts = FACTS.get(this); if (facts == null) { Set rules = RULES.get(Pair.of(functor(), length() - 1)); @@ -288,14 +289,14 @@ protected Set match() { if (pre.contains(this)) { return Set.of(INCOMPLETE); } else { - Set result = DERIVED.get(pre.prepend(this), () -> { - Set r = Set.of(); - for (RuleImpl rule : rules.random()) { - r = r.addAll(rule.eval(this)); + Collection result = DERIVED.get(pre.prepend(this), () -> { + Collection r = Set.of(); + for (RuleImpl rule : rules) { + r = Collection.concat(r, rule.eval(this)); } return r; }); - FACTS.force(this, result); + // FACTS.force(this, result); return result; } } else { @@ -383,10 +384,10 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set eval(TermImpl ptrn) { + protected Collection eval(TermImpl ptrn) { TermImpl head = term(); - Set> r = goal().eval(variables().putAll(head.getBinding(ptrn))); - return r.map(m -> head.setBinding(m)).asSet(); + Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn))); + return r.map(m -> head.setBinding(m)); } @Override @@ -434,17 +435,17 @@ protected GoalImpl term(Object[] array) { } @SuppressWarnings("rawtypes") - public Set> eval() { + public Collection> eval() { return eval(variables()); } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set> eval(Map vars) { + protected Collection> eval(Map vars) { return eval(((TermImpl) get(1)).list(), Set.of(vars)); } @SuppressWarnings({"rawtypes", "unchecked"}) - private Set> eval(List goals, Set> vars) { + private Collection> eval(List goals, Collection> vars) { if (goals.isEmpty()) { return vars; } else { @@ -456,12 +457,12 @@ private Set> eval(List goals, Set m = f.match(); + Collection m = f.match(); return eval(goals.removeIndex(i), m.map(t -> { Map pa = v.putAll(g.getBinding(t)); return pa; - }).asSet()); - }).asSet(); + })); + }); } } From 18e11442ed68adff16aa697d40ec22dda143e89a Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 10:54:59 +0100 Subject: [PATCH 090/179] pre order rules --- .../java/org/modelingvalue/dclare/Logic.java | 65 ++++++++++++++----- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 09cc6fec..5bccb556 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -40,18 +40,30 @@ private Logic() { } @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - - private static final BiFunction, RuleImpl, Set> ADD_RULE = (s, e) -> s == null ? Set.of(e) : s.add(e); + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + + private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { + if (l == null) { + return List.of(e); + } else { + int p = e.rulePrio(); + for (int i = 0; i < l.size(); i++) { + if (l.get(i).rulePrio() > p) { + return l.insert(i, e); + } + } + return l.append(e); + } + }; @SuppressWarnings("rawtypes") - private static final Context> DERIVED = Context.of(List.of()); + private static final Context> DERIVED = Context.of(List.of()); @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant, Set> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); + private static final Constant, List> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -283,21 +295,35 @@ protected TermImpl setBinding(Map vars) { protected Collection match() { Set facts = FACTS.get(this); if (facts == null) { - Set rules = RULES.get(Pair.of(functor(), length() - 1)); + List rules = RULES.get(Pair.of(functor(), length() - 1)); if (rules != null) { List pre = DERIVED.get(); if (pre.contains(this)) { return Set.of(INCOMPLETE); } else { + int non = nrOfNulls(); Collection result = DERIVED.get(pre.prepend(this), () -> { Collection r = Set.of(); for (RuleImpl rule : rules) { - r = Collection.concat(r, rule.eval(this)); + Collection eval = rule.eval(this); + if (non == 0) { + Set set = eval.asSet(); + if (!set.isEmpty()) { + return set; + } + } else { + r = Collection.concat(r, eval); + } } return r; }); - // FACTS.force(this, result); - return result; + if (non == 0 || (non == 1 && length() > 1)) { + Set set = result.asSet(); + FACTS.force(this, set); + return set; + } else { + return result; + } } } else { return Set.of(); @@ -308,12 +334,12 @@ protected Collection match() { } @SuppressWarnings("rawtypes") - protected int prio() { + protected int termPrio() { Set facts = FACTS.get(this); if (facts != null) { return Integer.MIN_VALUE + facts.size(); } else { - Set rules = RULES.get(Pair.of(functor(), length() - 1)); + List rules = RULES.get(Pair.of(functor(), length() - 1)); if (rules != null) { return nrOfNulls(); } @@ -395,6 +421,10 @@ protected Collection eval(TermImpl ptrn) { protected RuleImpl term(Object[] array) { return new RuleImpl(array[1], array[2]); } + + protected int rulePrio() { + return goal().goals().size(); + } } // Goals @@ -439,9 +469,14 @@ public Collection> eval() { return eval(variables()); } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings("rawtypes") protected Collection> eval(Map vars) { - return eval(((TermImpl) get(1)).list(), Set.of(vars)); + return eval(goals(), Set.of(vars)); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + protected List goals() { + return ((TermImpl) get(1)).list(); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -471,7 +506,7 @@ private static int first(List list) { int first = -1; int min = Integer.MAX_VALUE; for (int i = 0; i < list.size(); i++) { - int prio = list.get(i).prio(); + int prio = list.get(i).termPrio(); if (first == -1 || prio < min) { first = i; min = prio; From 27d9a294310e3d836028986837c6e9e61f016b44 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 11:08:49 +0100 Subject: [PATCH 091/179] no extend --- .../java/org/modelingvalue/dclare/Logic.java | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 5bccb556..31bf1ad7 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -229,22 +229,24 @@ protected TermImpl term(Object[] array) { @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); - patterns(1, toArray()); + patterns(1, toArray(), true); } - private void patterns(int i, Object[] array) { + private void patterns(int i, Object[] array, boolean empty) { if (i < length()) { array = array.clone(); if (array[i] == null) { array[i] = get(i); FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array); + patterns(i + 1, array, false); if (array[i] != null) { array[i] = null; - FACTS.force(term(array), ADD_FACT, this); + if (!empty || i < length() - 1) { + FACTS.force(term(array), ADD_FACT, this); + } } - patterns(i + 1, array); + patterns(i + 1, array, empty); } } @@ -299,30 +301,34 @@ protected Collection match() { if (rules != null) { List pre = DERIVED.get(); if (pre.contains(this)) { - return Set.of(INCOMPLETE); + return INCOMPLETE_SET; } else { int non = nrOfNulls(); - Collection result = DERIVED.get(pre.prepend(this), () -> { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this); - if (non == 0) { - Set set = eval.asSet(); - if (!set.isEmpty()) { - return set; + if (non == length()) { + return INCOMPLETE_SET; + } else { + Collection result = DERIVED.get(pre.prepend(this), () -> { + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this); + if (non == 0) { + Set set = eval.asSet(); + if (!set.isEmpty()) { + return set; + } + } else { + r = Collection.concat(r, eval); } - } else { - r = Collection.concat(r, eval); } + return r; + }); + if (non < 2) { + Set set = result.asSet(); + FACTS.force(this, set); + return set; + } else { + return result; } - return r; - }); - if (non == 0 || (non == 1 && length() > 1)) { - Set set = result.asSet(); - FACTS.force(this, set); - return set; - } else { - return result; } } } else { @@ -522,6 +528,7 @@ public interface Incomplete { } private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + private static final Set INCOMPLETE_SET = Set.of(INCOMPLETE); private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); @SuppressWarnings("rawtypes") private static final Map INCOMPLETE_MAP = Map.of(Entry.of(INCOMPLETE_VAR, INCOMPLETE)); From 211b8088e2713a5f2bff6d2b45552f1203b10ff5 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 11:09:33 +0100 Subject: [PATCH 092/179] warning --- src/main/java/org/modelingvalue/dclare/Logic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 31bf1ad7..051bd310 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -528,6 +528,7 @@ public interface Incomplete { } private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + @SuppressWarnings("rawtypes") private static final Set INCOMPLETE_SET = Set.of(INCOMPLETE); private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); @SuppressWarnings("rawtypes") From 02169cbc9e43617b1ea10b6498077ecb90559417 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 15:38:55 +0100 Subject: [PATCH 093/179] INCOMPLETE handling --- .../dclare/ActionTransaction.java | 1 - .../java/org/modelingvalue/dclare/Logic.java | 164 ++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 34 +++- 3 files changed, 122 insertions(+), 77 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 473a8dc3..56a8b4dd 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -46,7 +46,6 @@ public class ActionTransaction extends LeafTransaction implements StateMergeHand public void changed(O object, Setable setable, T preValue, T rawPreValue, T postValue) { ActionTransaction.this.changed(object, setable, preValue, rawPreValue, postValue); if (setable.id() instanceof Observed) { - // LeafTransaction.getCurrent().runSilent(() -> System.err.println("PULL " + object + "." + setable + "=" + postValue)); ActionTransaction.this.set(object, (Observed) setable.id(), preValue, postValue); } } diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 051bd310..42ed949b 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -32,7 +32,6 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; -import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.Pair; public final class Logic { @@ -56,9 +55,6 @@ private Logic() { } }; - @SuppressWarnings("rawtypes") - private static final Context> DERIVED = Context.of(List.of()); - @SuppressWarnings("rawtypes") private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @@ -103,23 +99,6 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } } - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public String toString() { - if (functor() == L.class) { - List list = List.of(); - ClauseImpl ht = this; - while (ht.length() == 3) { - list = list.prepend(ht.get(1)); - ht = (ClauseImpl) ht.get(2); - } - return list.toString().substring(4); - } else { - String string = super.toString(); - return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; - } - } - protected ClauseImpl(Class functor, Object... args) { super(unproxy(functor, args)); } @@ -158,6 +137,15 @@ private static final TermImpl unproxy(T object) { return (TermImpl) Proxy.getInvocationHandler(object); } + @SuppressWarnings("rawtypes") + private static final Object proxy(Object object) { + if (object instanceof ClauseImpl) { + return ((ClauseImpl) object).proxy(); + } else { + return object; + } + } + // Variables public static interface Variable { @@ -226,6 +214,17 @@ protected TermImpl term(Object[] array) { return new TermImpl((Class) array[0], Arrays.copyOfRange(array, 1, array.length)); } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public String toString() { + if (functor() == L.class) { + return list().toString().substring(4); + } else { + String string = super.toString(); + return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; + } + } + @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); @@ -265,7 +264,7 @@ protected Map variables() { @SuppressWarnings("rawtypes") protected Map getBinding(TermImpl term) { - if (term == INCOMPLETE) { + if (term.equals(INCOMPLETE)) { return INCOMPLETE_MAP; } else { Map vars = Map.of(); @@ -280,7 +279,7 @@ protected Map getBinding(TermImpl term) { @SuppressWarnings("rawtypes") protected TermImpl setBinding(Map vars) { - if (vars == INCOMPLETE_MAP) { + if (vars.containsKey(INCOMPLETE_VAR)) { return INCOMPLETE; } else { Object[] array = toArray(); @@ -294,40 +293,37 @@ protected TermImpl setBinding(Map vars) { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match() { + protected Collection match(List der) { Set facts = FACTS.get(this); if (facts == null) { List rules = RULES.get(Pair.of(functor(), length() - 1)); if (rules != null) { - List pre = DERIVED.get(); - if (pre.contains(this)) { + if (der.contains(this)) { return INCOMPLETE_SET; } else { int non = nrOfNulls(); - if (non == length()) { + if (non == length() - 1) { return INCOMPLETE_SET; } else { - Collection result = DERIVED.get(pre.prepend(this), () -> { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this); - if (non == 0) { - Set set = eval.asSet(); - if (!set.isEmpty()) { - return set; - } - } else { - r = Collection.concat(r, eval); + der = der.prepend(this); + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this, der); + if (non == 0) { + Set set = eval.asSet(); + if (!set.isEmpty()) { + return set; } + } else { + r = Collection.concat(r, eval); } - return r; - }); + } if (non < 2) { - Set set = result.asSet(); + Set set = r.asSet(); FACTS.force(this, set); return set; } else { - return result; + return r; } } } @@ -340,17 +336,26 @@ protected Collection match() { } @SuppressWarnings("rawtypes") - protected int termPrio() { - Set facts = FACTS.get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); + protected int termPrio(List der) { + int non = nrOfNulls(); + if (non == length() - 1) { + return Integer.MAX_VALUE; } else { - List rules = RULES.get(Pair.of(functor(), length() - 1)); - if (rules != null) { - return nrOfNulls(); + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); + } else { + List rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { + if (der.contains(this)) { + return Integer.MAX_VALUE; + } else { + return non; + } + } } + return Integer.MIN_VALUE; } - return Integer.MIN_VALUE; } @SuppressWarnings("rawtypes") @@ -416,9 +421,9 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection eval(TermImpl ptrn) { + protected Collection eval(TermImpl ptrn, List der) { TermImpl head = term(); - Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn))); + Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn)), der); return r.map(m -> head.setBinding(m)); } @@ -442,6 +447,11 @@ public static boolean is(Term... goals) { return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); } + @SuppressWarnings("rawtypes") + public static Set> eval(Term... goals) { + return new GoalImpl(list(goals)).eval().map(m -> m.asMap(e -> Entry.of((Variable) e.getKey().proxy(), proxy(e.getValue())))).asSet(); + } + @SuppressWarnings({"unchecked", "rawtypes"}) public static Goal goal(Term... goals) { return new GoalImpl(list(goals)).proxy(); @@ -472,12 +482,12 @@ protected GoalImpl term(Object[] array) { @SuppressWarnings("rawtypes") public Collection> eval() { - return eval(variables()); + return eval(variables(), List.of()); } @SuppressWarnings("rawtypes") - protected Collection> eval(Map vars) { - return eval(goals(), Set.of(vars)); + protected Collection> eval(Map vars, List der) { + return eval(goals(), Set.of(vars), der); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -486,33 +496,37 @@ protected List goals() { } @SuppressWarnings({"rawtypes", "unchecked"}) - private Collection> eval(List goals, Collection> vars) { + private Collection> eval(List goals, Collection> vars, List der) { if (goals.isEmpty()) { return vars; } else { return vars.> flatMap(v -> { - List actual = List.of(); - for (TermImpl g : goals) { - actual = actual.add(g.setBinding(v)); + if (v.containsKey(INCOMPLETE_VAR)) { + return INCOMPLETE_MAP_SET; + } else { + List actual = List.of(); + for (TermImpl g : goals) { + actual = actual.add(g.setBinding(v)); + } + int i = first(actual, der); + TermImpl f = actual.get(i); + TermImpl g = goals.get(i); + Collection m = f.match(der); + return eval(goals.removeIndex(i), m.map(t -> { + Map b = g.getBinding(t); + return b == INCOMPLETE_MAP ? b : v.putAll(b); + }), der); } - int i = first(actual); - TermImpl f = actual.get(i); - TermImpl g = goals.get(i); - Collection m = f.match(); - return eval(goals.removeIndex(i), m.map(t -> { - Map pa = v.putAll(g.getBinding(t)); - return pa; - })); }); } } - @SuppressWarnings("rawtypes") - private static int first(List list) { + @SuppressWarnings({"rawtypes", "unchecked"}) + private static int first(List list, List der) { int first = -1; int min = Integer.MAX_VALUE; for (int i = 0; i < list.size(); i++) { - int prio = list.get(i).termPrio(); + int prio = list.get(i).termPrio(der); if (first == -1 || prio < min) { first = i; min = prio; @@ -527,12 +541,14 @@ private static int first(List list) { public interface Incomplete { } - private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); + @SuppressWarnings("rawtypes") + private static final Set INCOMPLETE_SET = Set.of(INCOMPLETE); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); @SuppressWarnings("rawtypes") - private static final Set INCOMPLETE_SET = Set.of(INCOMPLETE); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); + private static final Map INCOMPLETE_MAP = Map.of(Entry.of(INCOMPLETE_VAR, INCOMPLETE)); @SuppressWarnings("rawtypes") - private static final Map INCOMPLETE_MAP = Map.of(Entry.of(INCOMPLETE_VAR, INCOMPLETE)); + private static final Set> INCOMPLETE_MAP_SET = Set.of(INCOMPLETE_MAP); @SuppressWarnings("unchecked") public static Incomplete incomplete() { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index e7c9181b..870dcd5d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -20,8 +20,7 @@ package org.modelingvalue.dclare.test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; @@ -29,6 +28,9 @@ import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; +import org.modelingvalue.collections.Entry; +import org.modelingvalue.collections.Map; +import org.modelingvalue.collections.Set; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Universe; @@ -52,6 +54,10 @@ static void isFalse(Term... goals) { assertFalse(is(goals)); } + static void hasResult(Set> bindings, Term... goals) { + assertEquals(bindings, eval(goals)); + } + interface Person extends Term { } @@ -147,4 +153,28 @@ public void test1() { isTrue(ancestorDescendent(Carel, Wim)); }); } + + @RepeatedTest(1) + public void test2() { + run(() -> { + Person A = var("A"); // Ancestor + Person D = var("D"); // Descendent + Person R = var("R"); // Relative + + rule(ancestorDescendent(A, D), parentChild(A, D)); + rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); + // rule(ancestorDescendent(A, D), parentChild(A, R), ancestorDescendent(R, D)); + + Person Carel = person("Carel"); + Person Jan = person("Jan"); + Person Wim = person("Wim"); + + fact(parentChild(Carel, Jan)); + fact(parentChild(Jan, Wim)); + + hasResult(Set.of(Map.of(Entry.of(A, Jan)), Map.of(Entry.of(A, Carel))), ancestorDescendent(A, Wim)); + hasResult(Set.of(Map.of(Entry.of(D, Jan)), Map.of(Entry.of(D, Wim))), ancestorDescendent(Carel, D)); + }); + } + } From 195d95cb22bbc0cfdb213279f74b8ba63fad420a Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 16:03:22 +0100 Subject: [PATCH 094/179] Test Universe fix. --- src/main/java/org/modelingvalue/dclare/Universe.java | 12 ++++++------ .../org/modelingvalue/dclare/test/LogicTest.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index f5cbf152..815852d4 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -44,12 +44,12 @@ static Universe of(Feature... features) { return new Universe() { private final MutableClass universeClass = new MutableClass() { - @SuppressWarnings("unchecked") - Set> observers = // - (Set>) Collection.of(features).filter(Observer.class).asSet(); - @SuppressWarnings("unchecked") - Set> setables = // - (Set>) Collection.of(features).filter(Setable.class).asSet(); + @SuppressWarnings({"unchecked", "rawtypes"}) + Set> observers = // + (Set) Collection.of(features).filter(Observer.class).asSet(); + @SuppressWarnings({"unchecked", "rawtypes"}) + Set> setables = // + (Set) Collection.of(features).filter(Setable.class).asSet(); @Override public Set> dObservers() { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 870dcd5d..aa630ed0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -154,7 +154,7 @@ public void test1() { }); } - @RepeatedTest(1) + //@RepeatedTest(1) public void test2() { run(() -> { Person A = var("A"); // Ancestor From 441bf2b82ea80776e81573ef27e035240fbcad1e Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 16:11:29 +0100 Subject: [PATCH 095/179] fix --- .../java/org/modelingvalue/dclare/Logic.java | 73 ++++++++----------- .../modelingvalue/dclare/test/LogicTest.java | 3 +- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 42ed949b..9d8c8938 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -228,24 +228,22 @@ public String toString() { @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); - patterns(1, toArray(), true); + patterns(1, toArray()); } - private void patterns(int i, Object[] array, boolean empty) { + private void patterns(int i, Object[] array) { if (i < length()) { array = array.clone(); if (array[i] == null) { array[i] = get(i); FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array, false); + patterns(i + 1, array); if (array[i] != null) { array[i] = null; - if (!empty || i < length() - 1) { - FACTS.force(term(array), ADD_FACT, this); - } + FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array, empty); + patterns(i + 1, array); } } @@ -302,30 +300,26 @@ protected Collection match(List der) { return INCOMPLETE_SET; } else { int non = nrOfNulls(); - if (non == length() - 1) { - return INCOMPLETE_SET; - } else { - der = der.prepend(this); - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this, der); - if (non == 0) { - Set set = eval.asSet(); - if (!set.isEmpty()) { - return set; - } - } else { - r = Collection.concat(r, eval); + der = der.prepend(this); + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this, der); + if (non == 0) { + Set set = eval.asSet(); + if (!set.isEmpty()) { + return set; } - } - if (non < 2) { - Set set = r.asSet(); - FACTS.force(this, set); - return set; } else { - return r; + r = Collection.concat(r, eval); } } + if (non < 2 && non < length() - 1) { + Set set = r.asSet(); + FACTS.force(this, set); + return set; + } else { + return r; + } } } else { return Set.of(); @@ -337,25 +331,20 @@ protected Collection match(List der) { @SuppressWarnings("rawtypes") protected int termPrio(List der) { - int non = nrOfNulls(); - if (non == length() - 1) { - return Integer.MAX_VALUE; + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); } else { - Set facts = FACTS.get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); - } else { - List rules = RULES.get(Pair.of(functor(), length() - 1)); - if (rules != null) { - if (der.contains(this)) { - return Integer.MAX_VALUE; - } else { - return non; - } + List rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { + if (der.contains(this)) { + return Integer.MAX_VALUE; + } else { + return nrOfNulls(); } } - return Integer.MIN_VALUE; } + return Integer.MIN_VALUE; } @SuppressWarnings("rawtypes") diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index aa630ed0..0c7f48d5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -154,7 +154,7 @@ public void test1() { }); } - //@RepeatedTest(1) + @RepeatedTest(100) public void test2() { run(() -> { Person A = var("A"); // Ancestor @@ -163,7 +163,6 @@ public void test2() { rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); - // rule(ancestorDescendent(A, D), parentChild(A, R), ancestorDescendent(R, D)); Person Carel = person("Carel"); Person Jan = person("Jan"); From 7753091a34101b327fcf14667520e4bf777f1648 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 25 Nov 2024 17:01:19 +0100 Subject: [PATCH 096/179] bind utility --- src/main/java/org/modelingvalue/dclare/Logic.java | 11 +++++++++++ .../java/org/modelingvalue/dclare/test/LogicTest.java | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 9d8c8938..d7c33c3e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -582,4 +582,15 @@ public static void fact(Term term) { unproxy(term).makeFact(); } + // Variable bindings + + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Map bind(Term... varVal) { + Map b = Map.of(); + for (int i = 0; i < varVal.length; i += 2) { + b = b.add(Entry.of((Variable) varVal[i], varVal[i + 1])); + } + return b; + } + } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 0c7f48d5..7728dd09 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -28,11 +28,11 @@ import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; -import org.modelingvalue.collections.Entry; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Term; +import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -54,7 +54,7 @@ static void isFalse(Term... goals) { assertFalse(is(goals)); } - static void hasResult(Set> bindings, Term... goals) { + static void hasResult(Set> bindings, Term... goals) { assertEquals(bindings, eval(goals)); } @@ -171,8 +171,8 @@ public void test2() { fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); - hasResult(Set.of(Map.of(Entry.of(A, Jan)), Map.of(Entry.of(A, Carel))), ancestorDescendent(A, Wim)); - hasResult(Set.of(Map.of(Entry.of(D, Jan)), Map.of(Entry.of(D, Wim))), ancestorDescendent(Carel, D)); + hasResult(Set.of(bind(A, Jan), bind(A, Carel)), ancestorDescendent(A, Wim)); + hasResult(Set.of(bind(D, Jan), bind(D, Wim)), ancestorDescendent(Carel, D)); }); } From 4f23331b897981249a0a439686c8a36ec4c9225d Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 09:37:03 +0100 Subject: [PATCH 097/179] incomplete info and optional EXTEND usage --- .../java/org/modelingvalue/dclare/Logic.java | 185 ++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 21 +- 2 files changed, 124 insertions(+), 82 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index d7c33c3e..2656f062 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -38,28 +38,30 @@ public final class Logic { private Logic() { } + private static final boolean USE_EXTEND = Boolean.getBoolean("USE_EXTEND"); + @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - - private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { - if (l == null) { - return List.of(e); - } else { - int p = e.rulePrio(); - for (int i = 0; i < l.size(); i++) { - if (l.get(i).rulePrio() > p) { - return l.insert(i, e); - } - } - return l.append(e); - } - }; + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + + private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { + if (l == null) { + return List.of(e); + } else { + int p = e.rulePrio(); + for (int i = 0; i < l.size(); i++) { + if (l.get(i).rulePrio() > p) { + return l.insert(i, e); + } + } + return l.append(e); + } + }; @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant, List> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); + private static final Constant, List> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -228,22 +230,24 @@ public String toString() { @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); - patterns(1, toArray()); + patterns(1, toArray(), 2); } - private void patterns(int i, Object[] array) { + private void patterns(int i, Object[] array, int nrOfNulls) { if (i < length()) { array = array.clone(); if (array[i] == null) { array[i] = get(i); FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array); + patterns(i + 1, array, nrOfNulls); if (array[i] != null) { array[i] = null; - FACTS.force(term(array), ADD_FACT, this); + if (USE_EXTEND || nrOfNulls < array.length) { + FACTS.force(term(array), ADD_FACT, this); + } } - patterns(i + 1, array); + patterns(i + 1, array, nrOfNulls + 1); } } @@ -262,8 +266,8 @@ protected Map variables() { @SuppressWarnings("rawtypes") protected Map getBinding(TermImpl term) { - if (term.equals(INCOMPLETE)) { - return INCOMPLETE_MAP; + if (term.functor() == Incomplete.class) { + return Map.of(Entry.of(INCOMPLETE_VAR, term)); } else { Map vars = Map.of(); for (int i = 1; i < length(); i++) { @@ -277,8 +281,9 @@ protected Map getBinding(TermImpl term) { @SuppressWarnings("rawtypes") protected TermImpl setBinding(Map vars) { - if (vars.containsKey(INCOMPLETE_VAR)) { - return INCOMPLETE; + TermImpl inc = (TermImpl) vars.get(INCOMPLETE_VAR); + if (inc != null) { + return inc; } else { Object[] array = toArray(); for (int i = 1; i < length(); i++) { @@ -292,59 +297,67 @@ protected TermImpl setBinding(Map vars) { @SuppressWarnings({"rawtypes", "unchecked"}) protected Collection match(List der) { - Set facts = FACTS.get(this); - if (facts == null) { - List rules = RULES.get(Pair.of(functor(), length() - 1)); - if (rules != null) { - if (der.contains(this)) { - return INCOMPLETE_SET; - } else { - int non = nrOfNulls(); - der = der.prepend(this); - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this, der); - if (non == 0) { - Set set = eval.asSet(); - if (!set.isEmpty()) { - return set; + int non = nrOfNulls(); + if (!USE_EXTEND && non == length() - 1) { + return Set.of(incompl(der.append(this))); + } else { + Set facts = FACTS.get(this); + if (facts == null) { + List rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { + int i = der.lastIndexOf(this); + if (i >= 0) { + return Set.of(incompl(der.sublist(i, der.size()).append(this))); + } else { + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this, der.append(this)); + if (non == 0) { + eval = eval.asSet(); + if (eval.equals(Set.of(this))) { + return eval; + } } - } else { r = Collection.concat(r, eval); } + if (non < 2 && non < length() - 1) { + Set set = r.asSet(); + FACTS.force(this, set); + return set; + } else { + return r; + } } - if (non < 2 && non < length() - 1) { - Set set = r.asSet(); - FACTS.force(this, set); - return set; - } else { - return r; - } + } else { + return Set.of(); } } else { - return Set.of(); + return facts; } - } else { - return facts; } } @SuppressWarnings("rawtypes") protected int termPrio(List der) { - Set facts = FACTS.get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); + int non = nrOfNulls(); + if (!USE_EXTEND && non == length() - 1) { + return Integer.MAX_VALUE; } else { - List rules = RULES.get(Pair.of(functor(), length() - 1)); - if (rules != null) { - if (der.contains(this)) { - return Integer.MAX_VALUE; - } else { - return nrOfNulls(); + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); + } else { + List rules = RULES.get(Pair.of(functor(), length() - 1)); + if (rules != null) { + if (der.lastIndexOf(this) >= 0) { + return Integer.MAX_VALUE; + } else { + return non; + } } } + return Integer.MIN_VALUE; } - return Integer.MIN_VALUE; } @SuppressWarnings("rawtypes") @@ -487,11 +500,12 @@ protected List goals() { @SuppressWarnings({"rawtypes", "unchecked"}) private Collection> eval(List goals, Collection> vars, List der) { if (goals.isEmpty()) { + vars = vars.asSet(); return vars; } else { return vars.> flatMap(v -> { if (v.containsKey(INCOMPLETE_VAR)) { - return INCOMPLETE_MAP_SET; + return Set.of(v); } else { List actual = List.of(); for (TermImpl g : goals) { @@ -503,7 +517,7 @@ private Collection> eval(List goals, Collection m = f.match(der); return eval(goals.removeIndex(i), m.map(t -> { Map b = g.getBinding(t); - return b == INCOMPLETE_MAP ? b : v.putAll(b); + return b.containsKey(INCOMPLETE_VAR) ? b : v.putAll(b); }), der); } }); @@ -527,31 +541,33 @@ private static int first(List list, List der) { // Incomplete - public interface Incomplete { + public interface Incomplete extends Term { } - private static final TermImpl INCOMPLETE = new TermImpl(Incomplete.class); - @SuppressWarnings("rawtypes") - private static final Set INCOMPLETE_SET = Set.of(INCOMPLETE); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); - @SuppressWarnings("rawtypes") - private static final Map INCOMPLETE_MAP = Map.of(Entry.of(INCOMPLETE_VAR, INCOMPLETE)); - @SuppressWarnings("rawtypes") - private static final Set> INCOMPLETE_MAP_SET = Set.of(INCOMPLETE_MAP); - - @SuppressWarnings("unchecked") - public static Incomplete incomplete() { - return INCOMPLETE.proxy(); - } + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { return INCOMPLETE_VAR.proxy(); } + public static Map incomplete(Term... der) { + return Map.of(Entry.of((Variable) incompleteVar(), incompl(list(der)).proxy())); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static TermImpl incompl(List der) { + return incompl(list(der)); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static TermImpl incompl(TermImpl der) { + return new TermImpl(Incomplete.class, der); + } + // Lists - public interface L { + public interface L extends Term { } @SuppressWarnings("unchecked") @@ -576,6 +592,15 @@ private static TermImpl list(E... es) { return l; } + @SuppressWarnings("rawtypes") + private static TermImpl list(List es) { + TermImpl l = EMPTY_LIST; + for (int i = es.size() - 1; i >= 0; i--) { + l = new TermImpl(L.class, unproxy(es.get(i)), l); + } + return l; + } + // Facts, Is public static void fact(Term term) { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 7728dd09..e7c78ae6 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -159,10 +159,12 @@ public void test2() { run(() -> { Person A = var("A"); // Ancestor Person D = var("D"); // Descendent - Person R = var("R"); // Relative + Person B = var("B"); // Relative1 + Person C = var("C"); // Relative2 rule(ancestorDescendent(A, D), parentChild(A, D)); - rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); + rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); + rule(ancestorDescendent(A, D), parentChild(A, B), ancestorDescendent(B, C), parentChild(C, D)); Person Carel = person("Carel"); Person Jan = person("Jan"); @@ -176,4 +178,19 @@ public void test2() { }); } + @RepeatedTest(100) + public void test3() { + run(() -> { + Person P = var("P"); + Person C = var("C"); + + rule(parentChild(P, C), parentChild(P, C)); + + Person Jan = person("Jan"); + Person Wim = person("Wim"); + + hasResult(Set.of(incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))), parentChild(Wim, Jan)); + }); + } + } From d5829c61959dd1a45031f263fadf1cb5d7bbdd9f Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 13:58:10 +0100 Subject: [PATCH 098/179] functors --- .../java/org/modelingvalue/dclare/Logic.java | 166 +++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 13 +- 2 files changed, 136 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 2656f062..d1c08652 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -32,7 +32,6 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; -import org.modelingvalue.collections.util.Pair; public final class Logic { private Logic() { @@ -61,7 +60,7 @@ private Logic() { private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant, List> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); + private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -101,14 +100,22 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } } - protected ClauseImpl(Class functor, Object... args) { + protected ClauseImpl(Functor functor, Object... args) { super(unproxy(functor, args)); } + protected ClauseImpl(FunctImpl functor, Object... args) { + super(unproxy(functor, args)); + } + + protected ClauseImpl(Class type, Object... args) { + super(unproxy(type, args)); + } + @SuppressWarnings("rawtypes") - private static final Object[] unproxy(Class functor, Object[] args) { + private static final Object[] unproxy(Object functor, Object[] args) { Object[] result = new Object[args.length + 1]; - result[0] = functor; + result[0] = Logic.unproxy(functor); for (int i = 0; i < args.length; i++) { result[i + 1] = Logic.unproxy(args[i]); } @@ -117,10 +124,7 @@ private static final Object[] unproxy(Class functor, Object[] args) { protected abstract F proxy(); - @SuppressWarnings("unchecked") - protected Class functor() { - return (Class) get(0); - } + protected abstract Class type(); protected abstract ClauseImpl term(Object[] array); } @@ -148,31 +152,77 @@ private static final Object proxy(Object object) { } } + // Functor + + public interface Functor extends Term { + } + + private static FunctImpl functImpl(Class type, String name, int arity) { + return new FunctImpl(type, name, arity); + } + + public static Functor functor(Class type, String name, int arity) { + return functImpl(type, name, arity).proxy(); + } + + private static final class FunctImpl extends ClauseImpl> { + private static final long serialVersionUID = 285147889847599160L; + + @SuppressWarnings({"unchecked", "rawtypes"}) + private FunctImpl(Class type, String name, int arity) { + super((Class) Functor.class, type, name, arity); + } + + @Override + @SuppressWarnings("unchecked") + protected final Functor proxy() { + return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Functor.class}, this); + } + + @Override + public String toString() { + return ((String) get(2)); + } + + @Override + @SuppressWarnings("unchecked") + protected FunctImpl term(Object[] array) { + return new FunctImpl((Class) array[1], (String) array[2], (Integer) array[2]); + } + + @SuppressWarnings("unchecked") + @Override + protected Class> type() { + return (Class>) get(0); + } + + @SuppressWarnings("unchecked") + protected Class functType() { + return (Class) get(1); + } + } + // Variables public static interface Variable { } @SuppressWarnings("unchecked") - public static F var(Class functor, String id) { - return new VarImpl(functor, id).proxy(); + public static F var(Class type, String id) { + return new VarImpl(type, id).proxy(); } private static final class VarImpl extends ClauseImpl { private static final long serialVersionUID = -8998368070388908726L; - private VarImpl(Class functor, String name) { - super(functor, name); - } - - private VarImpl(Class functor, Object name) { - super(functor, name); + private VarImpl(Class type, String name) { + super(type, name); } @Override @SuppressWarnings("unchecked") protected final F proxy() { - return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Variable.class}, this); + return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type(), Variable.class}, this); } @Override @@ -183,7 +233,13 @@ public String toString() { @Override @SuppressWarnings("unchecked") protected VarImpl term(Object[] array) { - return new VarImpl(functor(), array[1]); + return new VarImpl(type(), (String) array[1]); + } + + @SuppressWarnings("unchecked") + @Override + protected Class type() { + return (Class) get(0); } } @@ -193,33 +249,41 @@ public static interface Term { } @SuppressWarnings("unchecked") - public static F term(Class functor, Object... args) { + public static F term(Functor functor, Object... args) { return new TermImpl(functor, args).proxy(); } + private static TermImpl termImpl(FunctImpl functor, Object... args) { + return new TermImpl(functor, args); + } + private static class TermImpl extends ClauseImpl { private static final long serialVersionUID = -1605559565948158856L; - private TermImpl(Class functor, Object... args) { + private TermImpl(Functor functor, Object... args) { + super(functor, args); + } + + private TermImpl(FunctImpl functor, Object... args) { super(functor, args); } @Override @SuppressWarnings("unchecked") protected F proxy() { - return (F) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{functor(), Term.class}, this); + return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type(), Term.class}, this); } @Override @SuppressWarnings("unchecked") protected TermImpl term(Object[] array) { - return new TermImpl((Class) array[0], Arrays.copyOfRange(array, 1, array.length)); + return new TermImpl((FunctImpl) array[0], Arrays.copyOfRange(array, 1, array.length)); } @SuppressWarnings({"unchecked", "rawtypes"}) @Override public String toString() { - if (functor() == L.class) { + if (type() == L.class) { return list().toString().substring(4); } else { String string = super.toString(); @@ -227,6 +291,17 @@ public String toString() { } } + @SuppressWarnings("unchecked") + @Override + protected Class type() { + return functor().functType(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + protected FunctImpl functor() { + return (FunctImpl) get(0); + } + @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); @@ -266,7 +341,7 @@ protected Map variables() { @SuppressWarnings("rawtypes") protected Map getBinding(TermImpl term) { - if (term.functor() == Incomplete.class) { + if (term.type() == Incomplete.class) { return Map.of(Entry.of(INCOMPLETE_VAR, term)); } else { Map vars = Map.of(); @@ -303,7 +378,7 @@ protected Collection match(List der) { } else { Set facts = FACTS.get(this); if (facts == null) { - List rules = RULES.get(Pair.of(functor(), length() - 1)); + List rules = RULES.get(functor()); if (rules != null) { int i = der.lastIndexOf(this); if (i >= 0) { @@ -347,7 +422,7 @@ protected int termPrio(List der) { if (facts != null) { return Integer.MIN_VALUE + facts.size(); } else { - List rules = RULES.get(Pair.of(functor(), length() - 1)); + List rules = RULES.get(functor()); if (rules != null) { if (der.lastIndexOf(this) >= 0) { return Integer.MAX_VALUE; @@ -387,11 +462,13 @@ protected int nrOfNulls() { public static interface Rule extends Term { } + private static final FunctImpl RULE_FUNCTOR = functImpl(Rule.class, "rule", 2); + @SuppressWarnings({"unchecked", "rawtypes"}) public static Rule rule(Term term, Term... goals) { RuleImpl ruleImpl = new RuleImpl(term, goal(goals)); TermImpl termImpl = unproxy(term); - RULES.force(Pair.of(termImpl.functor(), termImpl.length() - 1), ADD_RULE, ruleImpl); + RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); return ruleImpl.proxy(); } @@ -399,17 +476,17 @@ private static final class RuleImpl extends TermImpl { private static final long serialVersionUID = -4602043866952049391L; private RuleImpl(Term term, Goal goal) { - super(Rule.class, term, goal); + super(RULE_FUNCTOR, term, goal); } private RuleImpl(Object term, Object goal) { - super(Rule.class, term, goal); + super(RULE_FUNCTOR, term, goal); } @Override @SuppressWarnings("unchecked") protected final Rule proxy() { - return (Rule) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{Rule.class}, this); + return (Rule) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Rule.class}, this); } @SuppressWarnings("rawtypes") @@ -445,6 +522,8 @@ protected int rulePrio() { public static interface Goal extends Term { } + private static final FunctImpl GOAL_FUNCTOR = functImpl(Goal.class, "goal", 1); + public static boolean is(Term... goals) { return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); } @@ -463,17 +542,17 @@ private static final class GoalImpl extends TermImpl { private static final long serialVersionUID = -4100263206389367132L; private GoalImpl(L goals) { - super(Goal.class, goals); + super(GOAL_FUNCTOR, goals); } private GoalImpl(Object goals) { - super(Goal.class, goals); + super(GOAL_FUNCTOR, goals); } @Override @SuppressWarnings("unchecked") protected final Goal proxy() { - return (Goal) Proxy.newProxyInstance(functor().getClassLoader(), new Class[]{Goal.class}, this); + return (Goal) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Goal.class}, this); } @Override @@ -544,7 +623,9 @@ private static int first(List list, List der) { public interface Incomplete extends Term { } - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl(Incomplete.class, "incomplete", 1); + + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { @@ -562,7 +643,7 @@ private static TermImpl incompl(List der) { @SuppressWarnings({"unchecked", "rawtypes"}) private static TermImpl incompl(TermImpl der) { - return new TermImpl(Incomplete.class, der); + return termImpl(INCOMPLETE_FUNCTOR, der); } // Lists @@ -570,13 +651,18 @@ private static TermImpl incompl(TermImpl der) { public interface L extends Term { } + @SuppressWarnings("rawtypes") + private static final FunctImpl LIST_FUNCTOR_0 = functImpl(L.class, "l", 0); + @SuppressWarnings("rawtypes") + private static final FunctImpl LIST_FUNCTOR_2 = functImpl(L.class, "l", 2); + @SuppressWarnings("unchecked") public static L l(E head, L tail) { - return term(L.class, head, tail); + return termImpl(LIST_FUNCTOR_2, head, tail).proxy(); } @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = new TermImpl(L.class); + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); @SuppressWarnings({"unchecked", "rawtypes"}) public static L l(E... es) { @@ -587,7 +673,7 @@ public static L l(E... es) { private static TermImpl list(E... es) { TermImpl l = EMPTY_LIST; for (int i = es.length - 1; i >= 0; i--) { - l = new TermImpl(L.class, unproxy(es[i]), l); + l = termImpl(LIST_FUNCTOR_2, unproxy(es[i]), l); } return l; } @@ -596,7 +682,7 @@ private static TermImpl list(E... es) { private static TermImpl list(List es) { TermImpl l = EMPTY_LIST; for (int i = es.size() - 1; i >= 0; i--) { - l = new TermImpl(L.class, unproxy(es.get(i)), l); + l = termImpl(LIST_FUNCTOR_2, unproxy(es.get(i)), l); } return l; } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index e7c78ae6..81a75284 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -31,6 +31,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.dclare.Logic; +import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -61,8 +62,10 @@ static void hasResult(Set> bindings, Term... goals) { interface Person extends Term { } + static Functor person = functor(Person.class, "person", 1); + Person person(String name) { - return term(Person.class, name); + return term(person, name); } Person var(String name) { @@ -72,15 +75,19 @@ Person var(String name) { interface ParentChild extends Term { } + static Functor parentChild = functor(ParentChild.class, "parentChild", 2); + ParentChild parentChild(Person parent, Person child) { - return term(ParentChild.class, parent, child); + return term(parentChild, parent, child); } interface AncestorDescendent extends Term { } + static Functor ancestorDescendent = functor(AncestorDescendent.class, "ancestorDescendent", 2); + AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { - return term(AncestorDescendent.class, ancestor, descendent); + return term(ancestorDescendent, ancestor, descendent); } @RepeatedTest(100) From 56570e06472be20495a0bcc8ee7976d487a721bf Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 15:13:56 +0100 Subject: [PATCH 099/179] functors with arguments --- .../java/org/modelingvalue/dclare/Logic.java | 113 ++++++++++++++---- .../modelingvalue/dclare/test/LogicTest.java | 6 +- 2 files changed, 94 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index d1c08652..bf38ad50 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -32,6 +32,16 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; +import org.modelingvalue.collections.util.SerializableBiFunction; +import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; +import org.modelingvalue.collections.util.SerializableFunction; +import org.modelingvalue.collections.util.SerializableFunction.SerializableFunctionImpl; +import org.modelingvalue.collections.util.SerializableQuadFunction; +import org.modelingvalue.collections.util.SerializableQuadFunction.SerializableQuadFunctionImpl; +import org.modelingvalue.collections.util.SerializableSupplier; +import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; +import org.modelingvalue.collections.util.SerializableTriFunction; +import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; public final class Logic { private Logic() { @@ -157,20 +167,62 @@ private static final Object proxy(Object object) { public interface Functor extends Term { } - private static FunctImpl functImpl(Class type, String name, int arity) { - return new FunctImpl(type, name, arity); + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableSupplier method) { + SerializableSupplierImpl l = method.of(); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + } + + public static Functor functor(SerializableSupplier method) { + return functImpl(method).proxy(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableFunction method) { + SerializableFunctionImpl l = method.of(); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + } + + public static Functor functor(SerializableFunction method) { + return functImpl(method).proxy(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableBiFunction method) { + SerializableBiFunctionImpl l = method.of(); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + } + + public static Functor functor(SerializableBiFunction method) { + return functImpl(method).proxy(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableTriFunction method) { + SerializableTriFunctionImpl l = method.of(); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + } + + public static Functor functor(SerializableTriFunction method) { + return functImpl(method).proxy(); } - public static Functor functor(Class type, String name, int arity) { - return functImpl(type, name, arity).proxy(); + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableQuadFunction method) { + SerializableQuadFunctionImpl l = method.of(); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + } + + public static Functor functor(SerializableQuadFunction method) { + return functImpl(method).proxy(); } private static final class FunctImpl extends ClauseImpl> { private static final long serialVersionUID = 285147889847599160L; @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Class type, String name, int arity) { - super((Class) Functor.class, type, name, arity); + private FunctImpl(Class type, String name, TermImpl args) { + super((Class) Functor.class, type, name, args); } @Override @@ -185,9 +237,9 @@ public String toString() { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) protected FunctImpl term(Object[] array) { - return new FunctImpl((Class) array[1], (String) array[2], (Integer) array[2]); + return new FunctImpl((Class) array[1], (String) array[2], (TermImpl) array[3]); } @SuppressWarnings("unchecked") @@ -374,7 +426,7 @@ protected TermImpl setBinding(Map vars) { protected Collection match(List der) { int non = nrOfNulls(); if (!USE_EXTEND && non == length() - 1) { - return Set.of(incompl(der.append(this))); + return Set.of(incomplete(der.append(this))); } else { Set facts = FACTS.get(this); if (facts == null) { @@ -382,7 +434,7 @@ protected Collection match(List der) { if (rules != null) { int i = der.lastIndexOf(this); if (i >= 0) { - return Set.of(incompl(der.sublist(i, der.size()).append(this))); + return Set.of(incomplete(der.sublist(i, der.size()).append(this))); } else { Collection r = Set.of(); for (RuleImpl rule : rules) { @@ -462,11 +514,16 @@ protected int nrOfNulls() { public static interface Rule extends Term { } - private static final FunctImpl RULE_FUNCTOR = functImpl(Rule.class, "rule", 2); + private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule); @SuppressWarnings({"unchecked", "rawtypes"}) public static Rule rule(Term term, Term... goals) { - RuleImpl ruleImpl = new RuleImpl(term, goal(goals)); + return rule(term, goal(goals)); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Rule rule(Term term, Goal goal) { + RuleImpl ruleImpl = new RuleImpl(term, goal); TermImpl termImpl = unproxy(term); RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); return ruleImpl.proxy(); @@ -522,7 +579,8 @@ protected int rulePrio() { public static interface Goal extends Term { } - private static final FunctImpl GOAL_FUNCTOR = functImpl(Goal.class, "goal", 1); + @SuppressWarnings({"unchecked", "rawtypes"}) + private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal); public static boolean is(Term... goals) { return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); @@ -535,7 +593,12 @@ public static Set> eval(Term... goals) { @SuppressWarnings({"unchecked", "rawtypes"}) public static Goal goal(Term... goals) { - return new GoalImpl(list(goals)).proxy(); + return goal(list(goals).proxy()); + } + + @SuppressWarnings("unchecked") + public static Goal goal(L goals) { + return new GoalImpl(goals).proxy(); } private static final class GoalImpl extends TermImpl { @@ -623,9 +686,10 @@ private static int first(List list, List der) { public interface Incomplete extends Term { } - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl(Incomplete.class, "incomplete", 1); + @SuppressWarnings("rawtypes") + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "Incomplete"); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { @@ -633,28 +697,33 @@ public static Incomplete incompleteVar() { } public static Map incomplete(Term... der) { - return Map.of(Entry.of((Variable) incompleteVar(), incompl(list(der)).proxy())); + return Map.of(Entry.of((Variable) incompleteVar(), incomplete(list(der)).proxy())); } @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl incompl(List der) { - return incompl(list(der)); + private static TermImpl incomplete(List der) { + return incomplete(list(der)); } @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl incompl(TermImpl der) { + private static TermImpl incomplete(TermImpl der) { return termImpl(INCOMPLETE_FUNCTOR, der); } + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Incomplete incomplete(L der) { + return termImpl(INCOMPLETE_FUNCTOR, der).proxy(); + } + // Lists public interface L extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl(L.class, "l", 0); + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l); @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl(L.class, "l", 2); + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l); @SuppressWarnings("unchecked") public static L l(E head, L tail) { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 81a75284..b8267381 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -62,7 +62,7 @@ static void hasResult(Set> bindings, Term... goals) { interface Person extends Term { } - static Functor person = functor(Person.class, "person", 1); + static Functor person = functor(LogicTest::person); Person person(String name) { return term(person, name); @@ -75,7 +75,7 @@ Person var(String name) { interface ParentChild extends Term { } - static Functor parentChild = functor(ParentChild.class, "parentChild", 2); + static Functor parentChild = functor(LogicTest::parentChild); ParentChild parentChild(Person parent, Person child) { return term(parentChild, parent, child); @@ -84,7 +84,7 @@ ParentChild parentChild(Person parent, Person child) { interface AncestorDescendent extends Term { } - static Functor ancestorDescendent = functor(AncestorDescendent.class, "ancestorDescendent", 2); + static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(ancestorDescendent, ancestor, descendent); From 2b7e1054fbbc16c882738abae712d52e57f10cd4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 16:28:28 +0100 Subject: [PATCH 100/179] empty L functor fix --- src/main/java/org/modelingvalue/dclare/Logic.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index bf38ad50..13ec51b1 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -252,6 +252,11 @@ protected Class> type() { protected Class functType() { return (Class) get(1); } + + @Override + public int hashCode() { + return super.hashCode(); + } } // Variables @@ -731,7 +736,15 @@ public static L l(E head, L tail) { } @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + + @SuppressWarnings("rawtypes") + private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); + + @SuppressWarnings({"unchecked", "rawtypes"}) + public static L l() { + return EMPTY_LIST_PROXY; + } @SuppressWarnings({"unchecked", "rawtypes"}) public static L l(E... es) { From 2edaf9e90bf6c7fee7d9fbcb8341d33d7fef48e2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 16:29:08 +0100 Subject: [PATCH 101/179] remove hashcode --- src/main/java/org/modelingvalue/dclare/Logic.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 13ec51b1..13c5a657 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -252,11 +252,6 @@ protected Class> type() { protected Class functType() { return (Class) get(1); } - - @Override - public int hashCode() { - return super.hashCode(); - } } // Variables From a3d303b59b4c9f282180ce4d5da01e56c3174d30 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 26 Nov 2024 19:04:23 +0100 Subject: [PATCH 102/179] functor uses List iso L --- .../java/org/modelingvalue/dclare/Logic.java | 110 +++++++++++------- 1 file changed, 67 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 13c5a657..0785df1e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -24,6 +24,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; +import java.util.Objects; import java.util.function.BiFunction; import org.modelingvalue.collections.Collection; @@ -115,15 +116,24 @@ protected ClauseImpl(Functor functor, Object... args) { } protected ClauseImpl(FunctImpl functor, Object... args) { - super(unproxy(functor, args)); + super(array(functor, args)); } protected ClauseImpl(Class type, Object... args) { - super(unproxy(type, args)); + super(array(type, args)); + } + + private static final Object[] array(Object functor, Object[] args) { + Object[] result = new Object[args.length + 1]; + result[0] = noProxy(functor); + for (int i = 0; i < args.length; i++) { + result[i + 1] = noProxy(args[i]); + } + return result; } @SuppressWarnings("rawtypes") - private static final Object[] unproxy(Object functor, Object[] args) { + private static final Object[] unproxy(Functor functor, Object[] args) { Object[] result = new Object[args.length + 1]; result[0] = Logic.unproxy(functor); for (int i = 0; i < args.length; i++) { @@ -139,18 +149,27 @@ private static final Object[] unproxy(Object functor, Object[] args) { protected abstract ClauseImpl term(Object[] array); } + private static final Object noProxy(Object object) { + if (object instanceof Term) { + throw new IllegalArgumentException(); + } else { + return object; + } + } + @SuppressWarnings("rawtypes") private static final Object unproxy(Object object) { if (object instanceof Term) { return Proxy.getInvocationHandler(object); } else { + Objects.requireNonNull(object); return object; } } @SuppressWarnings("unchecked") - private static final TermImpl unproxy(T object) { - return (TermImpl) Proxy.getInvocationHandler(object); + private static final ClauseImpl unproxy(T object) { + return (ClauseImpl) Proxy.getInvocationHandler(object); } @SuppressWarnings("rawtypes") @@ -170,7 +189,7 @@ public interface Functor extends Term { @SuppressWarnings("unchecked") private static FunctImpl functImpl(SerializableSupplier method) { SerializableSupplierImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); } public static Functor functor(SerializableSupplier method) { @@ -180,7 +199,7 @@ public static Functor functor(SerializableSupplier method) { @SuppressWarnings("unchecked") private static FunctImpl functImpl(SerializableFunction method) { SerializableFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); } public static Functor functor(SerializableFunction method) { @@ -190,7 +209,7 @@ public static Functor functor(SerializableFunction method) { @SuppressWarnings("unchecked") private static FunctImpl functImpl(SerializableBiFunction method) { SerializableBiFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); } public static Functor functor(SerializableBiFunction method) { @@ -200,7 +219,7 @@ public static Functor functor(SerializableBiFunction metho @SuppressWarnings("unchecked") private static FunctImpl functImpl(SerializableTriFunction method) { SerializableTriFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); } public static Functor functor(SerializableTriFunction method) { @@ -210,7 +229,7 @@ public static Functor functor(SerializableTriFunction FunctImpl functImpl(SerializableQuadFunction method) { SerializableQuadFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), list(l.in())); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); } public static Functor functor(SerializableQuadFunction method) { @@ -221,7 +240,7 @@ private static final class FunctImpl extends ClauseImpl> { private static final long serialVersionUID = 285147889847599160L; @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Class type, String name, TermImpl args) { + private FunctImpl(Class type, String name, List> args) { super((Class) Functor.class, type, name, args); } @@ -239,7 +258,7 @@ public String toString() { @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected FunctImpl term(Object[] array) { - return new FunctImpl((Class) array[1], (String) array[2], (TermImpl) array[3]); + return new FunctImpl((Class) array[1], (String) array[2], (List>) array[3]); } @SuppressWarnings("unchecked") @@ -256,7 +275,7 @@ protected Class functType() { // Variables - public static interface Variable { + public static interface Variable extends Term { } @SuppressWarnings("unchecked") @@ -301,15 +320,15 @@ public static interface Term { } @SuppressWarnings("unchecked") - public static F term(Functor functor, Object... args) { + public static F term(Functor functor, Object... args) { return new TermImpl(functor, args).proxy(); } - private static TermImpl termImpl(FunctImpl functor, Object... args) { + private static TermImpl termImpl(FunctImpl functor, Object... args) { return new TermImpl(functor, args); } - private static class TermImpl extends ClauseImpl { + private static class TermImpl extends ClauseImpl { private static final long serialVersionUID = -1605559565948158856L; private TermImpl(Functor functor, Object... args) { @@ -514,7 +533,8 @@ protected int nrOfNulls() { public static interface Rule extends Term { } - private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule); + private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule); + private static final Functor RULE_FUNCTOR_PROXY = RULE_FUNCTOR.proxy(); @SuppressWarnings({"unchecked", "rawtypes"}) public static Rule rule(Term term, Term... goals) { @@ -524,7 +544,7 @@ public static Rule rule(Term term, Term... goals) { @SuppressWarnings({"unchecked", "rawtypes"}) public static Rule rule(Term term, Goal goal) { RuleImpl ruleImpl = new RuleImpl(term, goal); - TermImpl termImpl = unproxy(term); + TermImpl termImpl = (TermImpl) unproxy(term); RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); return ruleImpl.proxy(); } @@ -533,10 +553,11 @@ private static final class RuleImpl extends TermImpl { private static final long serialVersionUID = -4602043866952049391L; private RuleImpl(Term term, Goal goal) { - super(RULE_FUNCTOR, term, goal); + super(RULE_FUNCTOR_PROXY, term, goal); } - private RuleImpl(Object term, Object goal) { + @SuppressWarnings("rawtypes") + private RuleImpl(TermImpl term, GoalImpl goal) { super(RULE_FUNCTOR, term, goal); } @@ -564,9 +585,9 @@ protected Collection eval(TermImpl ptrn, List der) { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) protected RuleImpl term(Object[] array) { - return new RuleImpl(array[1], array[2]); + return new RuleImpl((TermImpl) array[1], (GoalImpl) array[2]); } protected int rulePrio() { @@ -580,7 +601,8 @@ public static interface Goal extends Term { } @SuppressWarnings({"unchecked", "rawtypes"}) - private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal); + private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal); + private static final Functor GOAL_FUNCTOR_PROXY = GOAL_FUNCTOR.proxy(); public static boolean is(Term... goals) { return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); @@ -593,7 +615,7 @@ public static Set> eval(Term... goals) { @SuppressWarnings({"unchecked", "rawtypes"}) public static Goal goal(Term... goals) { - return goal(list(goals).proxy()); + return new GoalImpl(list(goals)).proxy(); } @SuppressWarnings("unchecked") @@ -605,10 +627,11 @@ private static final class GoalImpl extends TermImpl { private static final long serialVersionUID = -4100263206389367132L; private GoalImpl(L goals) { - super(GOAL_FUNCTOR, goals); + super(GOAL_FUNCTOR_PROXY, goals); } - private GoalImpl(Object goals) { + @SuppressWarnings("rawtypes") + private GoalImpl(TermImpl goals) { super(GOAL_FUNCTOR, goals); } @@ -619,9 +642,9 @@ protected final Goal proxy() { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) protected GoalImpl term(Object[] array) { - return new GoalImpl(array[1]); + return new GoalImpl((TermImpl) array[1]); } @SuppressWarnings("rawtypes") @@ -687,13 +710,14 @@ public interface Incomplete extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete); - - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete); + private static final Functor INCOMPLETE_FUNCTOR_PROXY = INCOMPLETE_FUNCTOR.proxy(); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); + private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { - return INCOMPLETE_VAR.proxy(); + return INCOMPLETE_VAR_PROXY; } public static Map incomplete(Term... der) { @@ -712,7 +736,7 @@ private static TermImpl incomplete(TermImpl der) { @SuppressWarnings({"unchecked", "rawtypes"}) private static Incomplete incomplete(L der) { - return termImpl(INCOMPLETE_FUNCTOR, der).proxy(); + return term(INCOMPLETE_FUNCTOR_PROXY, der); } // Lists @@ -721,21 +745,21 @@ public interface L extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l); + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l); @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l); + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l); + @SuppressWarnings("rawtypes") + private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); + @SuppressWarnings("rawtypes") + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + @SuppressWarnings("rawtypes") + private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); @SuppressWarnings("unchecked") public static L l(E head, L tail) { - return termImpl(LIST_FUNCTOR_2, head, tail).proxy(); + return term(LIST_FUNCTOR_2_PROXY, head, tail); } - @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); - - @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); - @SuppressWarnings({"unchecked", "rawtypes"}) public static L l() { return EMPTY_LIST_PROXY; @@ -767,7 +791,7 @@ private static TermImpl list(List es) { // Facts, Is public static void fact(Term term) { - unproxy(term).makeFact(); + ((TermImpl) unproxy(term)).makeFact(); } // Variable bindings From 27021a68f885293d05d92921f44f92486e57a1a4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 27 Nov 2024 08:41:52 +0100 Subject: [PATCH 103/179] also cash direct matches --- src/main/java/org/modelingvalue/dclare/Logic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 0785df1e..5518a964 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -461,7 +461,8 @@ protected Collection match(List der) { if (non == 0) { eval = eval.asSet(); if (eval.equals(Set.of(this))) { - return eval; + r = eval; + break; } } r = Collection.concat(r, eval); From 5cccc54697336055611368a9fa4a89cd865fcab0 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 27 Nov 2024 08:51:41 +0100 Subject: [PATCH 104/179] reuse array --- .../java/org/modelingvalue/dclare/Logic.java | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 5518a964..eb11461e 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -123,6 +123,10 @@ protected ClauseImpl(Class type, Object... args) { super(array(type, args)); } + protected ClauseImpl(Object[] args) { + super(args); + } + private static final Object[] array(Object functor, Object[] args) { Object[] result = new Object[args.length + 1]; result[0] = noProxy(functor); @@ -244,6 +248,11 @@ private FunctImpl(Class type, String name, List> args) { super((Class) Functor.class, type, name, args); } + @SuppressWarnings({"unchecked", "rawtypes"}) + private FunctImpl(Object[] args) { + super(args); + } + @Override @SuppressWarnings("unchecked") protected final Functor proxy() { @@ -258,7 +267,7 @@ public String toString() { @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected FunctImpl term(Object[] array) { - return new FunctImpl((Class) array[1], (String) array[2], (List>) array[3]); + return new FunctImpl(array); } @SuppressWarnings("unchecked") @@ -290,6 +299,10 @@ private VarImpl(Class type, String name) { super(type, name); } + private VarImpl(Object[] args) { + super(args); + } + @Override @SuppressWarnings("unchecked") protected final F proxy() { @@ -304,7 +317,7 @@ public String toString() { @Override @SuppressWarnings("unchecked") protected VarImpl term(Object[] array) { - return new VarImpl(type(), (String) array[1]); + return new VarImpl(array); } @SuppressWarnings("unchecked") @@ -339,6 +352,10 @@ private TermImpl(FunctImpl functor, Object... args) { super(functor, args); } + private TermImpl(Object[] args) { + super(args); + } + @Override @SuppressWarnings("unchecked") protected F proxy() { @@ -562,6 +579,10 @@ private RuleImpl(TermImpl term, GoalImpl goal) { super(RULE_FUNCTOR, term, goal); } + private RuleImpl(Object[] args) { + super(args); + } + @Override @SuppressWarnings("unchecked") protected final Rule proxy() { @@ -588,7 +609,7 @@ protected Collection eval(TermImpl ptrn, List der) { @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected RuleImpl term(Object[] array) { - return new RuleImpl((TermImpl) array[1], (GoalImpl) array[2]); + return new RuleImpl(array); } protected int rulePrio() { @@ -636,6 +657,10 @@ private GoalImpl(TermImpl goals) { super(GOAL_FUNCTOR, goals); } + private GoalImpl(Object[] args) { + super(args); + } + @Override @SuppressWarnings("unchecked") protected final Goal proxy() { @@ -645,7 +670,7 @@ protected final Goal proxy() { @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected GoalImpl term(Object[] array) { - return new GoalImpl((TermImpl) array[1]); + return new GoalImpl(array); } @SuppressWarnings("rawtypes") From 745c688d4ff47039363b00daeabba5bcfed5147f Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 27 Nov 2024 09:20:41 +0100 Subject: [PATCH 105/179] var --- .../java/org/modelingvalue/dclare/Logic.java | 3 +- .../modelingvalue/dclare/test/LogicTest.java | 29 ++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index eb11461e..50f8a5e9 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -656,7 +656,8 @@ private GoalImpl(L goals) { private GoalImpl(TermImpl goals) { super(GOAL_FUNCTOR, goals); } - + + private GoalImpl(Object[] args) { super(args); } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index b8267381..9797c9a0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -30,7 +30,6 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; -import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; @@ -68,10 +67,6 @@ Person person(String name) { return term(person, name); } - Person var(String name) { - return Logic.var(Person.class, name); - } - interface ParentChild extends Term { } @@ -93,9 +88,9 @@ AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { @RepeatedTest(100) public void test0() { run(() -> { - Person A = var("A"); // Ancestor - Person D = var("D"); // Descendent - Person R = var("R"); // Relative + Person A = var(Person.class, "A"); // Ancestor + Person D = var(Person.class, "D"); // Descendent + Person R = var(Person.class, "R"); // Relative rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -136,9 +131,9 @@ public void test0() { @RepeatedTest(100) public void test1() { run(() -> { - Person A = var("A"); // Ancestor - Person D = var("D"); // Descendent - Person R = var("R"); // Relative + Person A = var(Person.class, "A"); // Ancestor + Person D = var(Person.class, "D"); // Descendent + Person R = var(Person.class, "R"); // Relative rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -164,10 +159,10 @@ public void test1() { @RepeatedTest(100) public void test2() { run(() -> { - Person A = var("A"); // Ancestor - Person D = var("D"); // Descendent - Person B = var("B"); // Relative1 - Person C = var("C"); // Relative2 + Person A = var(Person.class, "A"); // Ancestor + Person D = var(Person.class, "D"); // Descendent + Person B = var(Person.class, "B"); // Relative1 + Person C = var(Person.class, "C"); // Relative2 rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); @@ -188,8 +183,8 @@ public void test2() { @RepeatedTest(100) public void test3() { run(() -> { - Person P = var("P"); - Person C = var("C"); + Person P = var(Person.class, "P"); + Person C = var(Person.class, "C"); rule(parentChild(P, C), parentChild(P, C)); From 11bc302707a67ea0d81a6469eb28b225ce34d642 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 27 Nov 2024 11:02:25 +0100 Subject: [PATCH 106/179] var method --- .../modelingvalue/dclare/test/LogicTest.java | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 9797c9a0..1fa80af0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -38,6 +38,8 @@ public class LogicTest { + // Utilities + void run(Runnable test) { UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); boolean seq = ThreadLocalRandom.current().nextBoolean(); @@ -58,21 +60,27 @@ static void hasResult(Set> bindings, Term... goals) { assertEquals(bindings, eval(goals)); } + // Example + interface Person extends Term { } static Functor person = functor(LogicTest::person); - Person person(String name) { + static Person person(String name) { return term(person, name); } + static Person personVar(String name) { + return var(Person.class, name); + } + interface ParentChild extends Term { } static Functor parentChild = functor(LogicTest::parentChild); - ParentChild parentChild(Person parent, Person child) { + static ParentChild parentChild(Person parent, Person child) { return term(parentChild, parent, child); } @@ -81,16 +89,16 @@ interface AncestorDescendent extends Term { static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); - AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { + static AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(ancestorDescendent, ancestor, descendent); } @RepeatedTest(100) public void test0() { run(() -> { - Person A = var(Person.class, "A"); // Ancestor - Person D = var(Person.class, "D"); // Descendent - Person R = var(Person.class, "R"); // Relative + Person A = personVar("A"); // Ancestor + Person D = personVar("D"); // Descendent + Person R = personVar("R"); // Relative rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -131,9 +139,9 @@ public void test0() { @RepeatedTest(100) public void test1() { run(() -> { - Person A = var(Person.class, "A"); // Ancestor - Person D = var(Person.class, "D"); // Descendent - Person R = var(Person.class, "R"); // Relative + Person A = personVar("A"); // Ancestor + Person D = personVar("D"); // Descendent + Person R = personVar("R"); // Relative rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -159,10 +167,10 @@ public void test1() { @RepeatedTest(100) public void test2() { run(() -> { - Person A = var(Person.class, "A"); // Ancestor - Person D = var(Person.class, "D"); // Descendent - Person B = var(Person.class, "B"); // Relative1 - Person C = var(Person.class, "C"); // Relative2 + Person A = personVar("A"); // Ancestor + Person D = personVar("D"); // Descendent + Person B = personVar("B"); // Relative1 + Person C = personVar("C"); // Relative2 rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); @@ -183,8 +191,8 @@ public void test2() { @RepeatedTest(100) public void test3() { run(() -> { - Person P = var(Person.class, "P"); - Person C = var(Person.class, "C"); + Person P = personVar("P"); + Person C = personVar("C"); rule(parentChild(P, C), parentChild(P, C)); From 63821cc5ecd7dd736ca1a1c57938665edbd3f1a5 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 27 Nov 2024 12:48:19 +0100 Subject: [PATCH 107/179] separate var methods --- .../java/org/modelingvalue/dclare/test/LogicTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 1fa80af0..efc10c35 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -84,6 +84,10 @@ static ParentChild parentChild(Person parent, Person child) { return term(parentChild, parent, child); } + static ParentChild parentChildVar(String name) { + return var(ParentChild.class, name); + } + interface AncestorDescendent extends Term { } @@ -93,6 +97,10 @@ static AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) return term(ancestorDescendent, ancestor, descendent); } + static AncestorDescendent ancestorDescendentVar(String name) { + return var(AncestorDescendent.class, name); + } + @RepeatedTest(100) public void test0() { run(() -> { From ceac9c7c5eb520467e848826de72a1917bfb69da Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 28 Nov 2024 09:12:12 +0100 Subject: [PATCH 108/179] Logic with function implementations part 1 --- .../java/org/modelingvalue/dclare/Logic.java | 111 +++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 104 ++++++++++------ 2 files changed, 152 insertions(+), 63 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 50f8a5e9..946d7255 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -33,6 +33,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; +import org.modelingvalue.collections.util.LambdaReflection; import org.modelingvalue.collections.util.SerializableBiFunction; import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; import org.modelingvalue.collections.util.SerializableFunction; @@ -190,61 +191,110 @@ private static final Object proxy(Object object) { public interface Functor extends Term { } + public interface Functor0 extends Functor { + } + @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableSupplier method) { + private static FunctImpl functImpl(SerializableSupplier method, SerializableSupplier> impl) { SerializableSupplierImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - public static Functor functor(SerializableSupplier method) { - return functImpl(method).proxy(); + @SuppressWarnings("unchecked") + public static Functor0 functor(SerializableSupplier method, SerializableSupplier> impl) { + return (Functor0) functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableFunction method) { + public static Functor0 functor(SerializableSupplier method) { + return (Functor0) functImpl(method, null).proxy(); + } + + public interface Functor1 extends Functor0 { + A get1(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableFunction method, SerializableFunction> impl) { SerializableFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - public static Functor functor(SerializableFunction method) { - return functImpl(method).proxy(); + @SuppressWarnings("unchecked") + public static Functor1 functor(SerializableFunction method, SerializableFunction> impl) { + return (Functor1) functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableBiFunction method) { + public static Functor1 functor(SerializableFunction method) { + return (Functor1) functImpl(method, null).proxy(); + } + + public interface Functor2 extends Functor1 { + B get2(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableBiFunction method, SerializableBiFunction> impl) { SerializableBiFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - public static Functor functor(SerializableBiFunction method) { - return functImpl(method).proxy(); + @SuppressWarnings("unchecked") + public static Functor2 functor(SerializableBiFunction method, SerializableBiFunction> impl) { + return (Functor2) functImpl(method, impl.of()).proxy(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableTriFunction method) { + public static Functor2 functor(SerializableBiFunction method) { + return (Functor2) functImpl(method, null).proxy(); + } + + public interface Functor3 extends Functor2 { + C get3(); + } + + @SuppressWarnings("unchecked") + private static FunctImpl functImpl(SerializableTriFunction method, SerializableTriFunction> impl) { SerializableTriFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); + } + + @SuppressWarnings("unchecked") + public static Functor3 functor(SerializableTriFunction method, SerializableTriFunction> impl) { + return (Functor3) functImpl(method, impl).proxy(); + } + + @SuppressWarnings("unchecked") + public static Functor3 functor(SerializableTriFunction method) { + return (Functor3) functImpl(method, null).proxy(); } - public static Functor functor(SerializableTriFunction method) { - return functImpl(method).proxy(); + public interface Functor4 extends Functor3 { + D get4(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableQuadFunction method) { + private static FunctImpl functImpl(SerializableQuadFunction method, SerializableQuadFunction> impl) { SerializableQuadFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in()); + return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); + } + + @SuppressWarnings("unchecked") + public static Functor4 functor(SerializableQuadFunction method, SerializableQuadFunction> impl) { + return (Functor4) functImpl(method, impl).proxy(); } - public static Functor functor(SerializableQuadFunction method) { - return functImpl(method).proxy(); + @SuppressWarnings("unchecked") + public static Functor4 functor(SerializableQuadFunction method) { + return (Functor4) functImpl(method, null).proxy(); } private static final class FunctImpl extends ClauseImpl> { private static final long serialVersionUID = 285147889847599160L; @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Class type, String name, List> args) { + private FunctImpl(Class type, String name, List> args, LambdaReflection l) { super((Class) Functor.class, type, name, args); } @@ -254,9 +304,11 @@ private FunctImpl(Object[] args) { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) protected final Functor proxy() { - return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Functor.class}, this); + int l = length() - 1; + Class f = l == 0 ? Functor0.class : l == 1 ? Functor1.class : l == 2 ? Functor2.class : l == 3 ? Functor3.class : Functor4.class; + return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{f}, this); } @Override @@ -551,7 +603,7 @@ protected int nrOfNulls() { public static interface Rule extends Term { } - private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule); + private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule, null); private static final Functor RULE_FUNCTOR_PROXY = RULE_FUNCTOR.proxy(); @SuppressWarnings({"unchecked", "rawtypes"}) @@ -623,7 +675,7 @@ public static interface Goal extends Term { } @SuppressWarnings({"unchecked", "rawtypes"}) - private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal); + private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal, null); private static final Functor GOAL_FUNCTOR_PROXY = GOAL_FUNCTOR.proxy(); public static boolean is(Term... goals) { @@ -656,8 +708,7 @@ private GoalImpl(L goals) { private GoalImpl(TermImpl goals) { super(GOAL_FUNCTOR, goals); } - - + private GoalImpl(Object[] args) { super(args); } @@ -737,7 +788,7 @@ public interface Incomplete extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete); + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); private static final Functor INCOMPLETE_FUNCTOR_PROXY = INCOMPLETE_FUNCTOR.proxy(); private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); @@ -772,9 +823,9 @@ public interface L extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l); + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l); + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); @SuppressWarnings("rawtypes") private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); @SuppressWarnings("rawtypes") diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index efc10c35..9a1db842 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -60,7 +60,49 @@ static void hasResult(Set> bindings, Term... goals) { assertEquals(bindings, eval(goals)); } - // Example + @SuppressWarnings({"unchecked", "rawtypes"}) + static Set> set(Map... bindings) { + return Set.of(bindings); + } + + // Integer + + interface Int extends Term { + } + + static Functor i = functor(LogicTest::i); + + static Int i(Integer x) { + return term(i, x); + } + + static Int iv(String name) { + return var(Int.class, name); + } + + Int mOne = i(-1); + Int zero = i(0); + Int one = i(1); + + Int U = iv("U"); + Int V = iv("V"); + Int W = iv("W"); + Int X = iv("X"); + Int Y = iv("Y"); + Int Z = iv("Z"); + + // Plus + + interface Pred extends Term { + } + + static Functor plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> Set. of()); + + static Pred plus(Int a, Int b, Int r) { + return term(plus, a, b, r); + } + + // FamilyTree interface Person extends Term { } @@ -101,24 +143,30 @@ static AncestorDescendent ancestorDescendentVar(String name) { return var(AncestorDescendent.class, name); } + // Variables + + Person A = personVar("A"); // Ancestor + Person D = personVar("D"); // Descendent + Person R = personVar("R"); // Relative + Person B = personVar("B"); // Relative1 + Person C = personVar("C"); // Relative2 + + // Terms + + Person Carel = person("Carel"); + Person Jan = person("Jan"); + Person Elske = person("Elske"); + Person Wim = person("Wim"); + Person Joppe = person("Joppe"); + Person Heleen = person("Heleen"); + Person Marijn = person("Marijn"); + @RepeatedTest(100) public void test0() { run(() -> { - Person A = personVar("A"); // Ancestor - Person D = personVar("D"); // Descendent - Person R = personVar("R"); // Relative - rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); - Person Carel = person("Carel"); - Person Jan = person("Jan"); - Person Elske = person("Elske"); - Person Wim = person("Wim"); - Person Joppe = person("Joppe"); - Person Heleen = person("Heleen"); - Person Marijn = person("Marijn"); - fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); fact(parentChild(Elske, Wim)); @@ -147,17 +195,9 @@ public void test0() { @RepeatedTest(100) public void test1() { run(() -> { - Person A = personVar("A"); // Ancestor - Person D = personVar("D"); // Descendent - Person R = personVar("R"); // Relative - rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); - Person Carel = person("Carel"); - Person Jan = person("Jan"); - Person Wim = person("Wim"); - fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); @@ -175,11 +215,6 @@ public void test1() { @RepeatedTest(100) public void test2() { run(() -> { - Person A = personVar("A"); // Ancestor - Person D = personVar("D"); // Descendent - Person B = personVar("B"); // Relative1 - Person C = personVar("C"); // Relative2 - rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); rule(ancestorDescendent(A, D), parentChild(A, B), ancestorDescendent(B, C), parentChild(C, D)); @@ -191,24 +226,27 @@ public void test2() { fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); - hasResult(Set.of(bind(A, Jan), bind(A, Carel)), ancestorDescendent(A, Wim)); - hasResult(Set.of(bind(D, Jan), bind(D, Wim)), ancestorDescendent(Carel, D)); + hasResult(set(bind(A, Jan), bind(A, Carel)), ancestorDescendent(A, Wim)); + hasResult(set(bind(D, Jan), bind(D, Wim)), ancestorDescendent(Carel, D)); }); } @RepeatedTest(100) public void test3() { run(() -> { - Person P = personVar("P"); - Person C = personVar("C"); - - rule(parentChild(P, C), parentChild(P, C)); + rule(parentChild(B, C), parentChild(B, C)); Person Jan = person("Jan"); Person Wim = person("Wim"); - hasResult(Set.of(incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))), parentChild(Wim, Jan)); + hasResult(set(incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))), parentChild(Wim, Jan)); }); } + @RepeatedTest(100) + public void test4() { + run(() -> { + rule(plus(zero, zero, zero)); + }); + } } From afd8e2877fd391ac035a33f34883dd507b06a40a Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 28 Nov 2024 16:05:24 +0100 Subject: [PATCH 109/179] only run when not more then on unknown variable --- .../java/org/modelingvalue/dclare/Logic.java | 73 ++++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 14 ++-- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 946d7255..4bef3869 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -385,8 +385,28 @@ public static interface Term { } @SuppressWarnings("unchecked") - public static F term(Functor functor, Object... args) { - return new TermImpl(functor, args).proxy(); + public static F term(Functor0 functor) { + return new TermImpl(functor).proxy(); + } + + @SuppressWarnings("unchecked") + public static F term(Functor1 functor, A a) { + return new TermImpl(functor, a).proxy(); + } + + @SuppressWarnings("unchecked") + public static F term(Functor2 functor, A a, B b) { + return new TermImpl(functor, a, b).proxy(); + } + + @SuppressWarnings("unchecked") + public static F term(Functor3 functor, A a, B b, C c) { + return new TermImpl(functor, a, b, c).proxy(); + } + + @SuppressWarnings("unchecked") + public static F term(Functor4 functor, A a, B b, C c, D d) { + return new TermImpl(functor, a, b, c, d).proxy(); } private static TermImpl termImpl(FunctImpl functor, Object... args) { @@ -445,24 +465,33 @@ protected FunctImpl functor() { @SuppressWarnings("rawtypes") protected final void makeFact() { FACTS.force(this, ADD_FACT, this); - patterns(1, toArray(), 2); + Object[] array = toArray(); + if (USE_EXTEND) { + patterns(1, array); + } else { + Object v; + for (int i = 1; i < array.length; i++) { + v = array[i]; + array[i] = null; + FACTS.force(term(array), ADD_FACT, this); + array[i] = v; + } + } } - private void patterns(int i, Object[] array, int nrOfNulls) { + private void patterns(int i, Object[] array) { if (i < length()) { array = array.clone(); if (array[i] == null) { array[i] = get(i); FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array, nrOfNulls); + patterns(i + 1, array); if (array[i] != null) { array[i] = null; - if (USE_EXTEND || nrOfNulls < array.length) { - FACTS.force(term(array), ADD_FACT, this); - } + FACTS.force(term(array), ADD_FACT, this); } - patterns(i + 1, array, nrOfNulls + 1); + patterns(i + 1, array); } } @@ -513,7 +542,7 @@ protected TermImpl setBinding(Map vars) { @SuppressWarnings({"rawtypes", "unchecked"}) protected Collection match(List der) { int non = nrOfNulls(); - if (!USE_EXTEND && non == length() - 1) { + if (!USE_EXTEND && (non > 1 || non >= length() - 1)) { return Set.of(incomplete(der.append(this))); } else { Set facts = FACTS.get(this); @@ -539,6 +568,9 @@ protected Collection match(List der) { if (non < 2 && non < length() - 1) { Set set = r.asSet(); FACTS.force(this, set); + for (TermImpl e : set) { + FACTS.force(e, Set.of(e)); + } return set; } else { return r; @@ -556,7 +588,7 @@ protected Collection match(List der) { @SuppressWarnings("rawtypes") protected int termPrio(List der) { int non = nrOfNulls(); - if (!USE_EXTEND && non == length() - 1) { + if (!USE_EXTEND && (non > 1 || non >= length() - 1)) { return Integer.MAX_VALUE; } else { Set facts = FACTS.get(this); @@ -788,10 +820,11 @@ public interface Incomplete extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); - private static final Functor INCOMPLETE_FUNCTOR_PROXY = INCOMPLETE_FUNCTOR.proxy(); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); - private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); + @SuppressWarnings("rawtypes") + private static final Functor1 INCOMPLETE_FUNCTOR_PROXY = (Functor1) INCOMPLETE_FUNCTOR.proxy(); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); + private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { @@ -823,15 +856,15 @@ public interface L extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); @SuppressWarnings("rawtypes") - private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); + private static final Functor2 LIST_FUNCTOR_2_PROXY = (Functor2) LIST_FUNCTOR_2.proxy(); @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); + private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); @SuppressWarnings("unchecked") public static L l(E head, L tail) { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 9a1db842..3befdbc0 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -30,7 +30,9 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; -import org.modelingvalue.dclare.Logic.Functor; +import org.modelingvalue.dclare.Logic.Functor1; +import org.modelingvalue.dclare.Logic.Functor2; +import org.modelingvalue.dclare.Logic.Functor3; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -70,7 +72,7 @@ static Set> set(Map... bindings) { interface Int extends Term { } - static Functor i = functor(LogicTest::i); + static Functor1 i = functor(LogicTest::i); static Int i(Integer x) { return term(i, x); @@ -96,7 +98,7 @@ static Int iv(String name) { interface Pred extends Term { } - static Functor plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> Set. of()); + static Functor3 plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> Set. of()); static Pred plus(Int a, Int b, Int r) { return term(plus, a, b, r); @@ -107,7 +109,7 @@ static Pred plus(Int a, Int b, Int r) { interface Person extends Term { } - static Functor person = functor(LogicTest::person); + static Functor1 person = functor(LogicTest::person); static Person person(String name) { return term(person, name); @@ -120,7 +122,7 @@ static Person personVar(String name) { interface ParentChild extends Term { } - static Functor parentChild = functor(LogicTest::parentChild); + static Functor2 parentChild = functor(LogicTest::parentChild); static ParentChild parentChild(Person parent, Person child) { return term(parentChild, parent, child); @@ -133,7 +135,7 @@ static ParentChild parentChildVar(String name) { interface AncestorDescendent extends Term { } - static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); + static Functor2 ancestorDescendent = functor(LogicTest::ancestorDescendent); static AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(ancestorDescendent, ancestor, descendent); From 07c42491476dafffa7f6e4fced3ca80b90c3a057 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 28 Nov 2024 17:03:32 +0100 Subject: [PATCH 110/179] lambdas in logic --- .../java/org/modelingvalue/dclare/Logic.java | 126 +++++++++++------- .../modelingvalue/dclare/test/LogicTest.java | 29 +++- 2 files changed, 103 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 4bef3869..0b9d52fc 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -26,6 +26,8 @@ import java.util.Arrays; import java.util.Objects; import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Supplier; import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Entry; @@ -33,16 +35,11 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; -import org.modelingvalue.collections.util.LambdaReflection; -import org.modelingvalue.collections.util.SerializableBiFunction; +import org.modelingvalue.collections.util.*; import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; -import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.collections.util.SerializableFunction.SerializableFunctionImpl; -import org.modelingvalue.collections.util.SerializableQuadFunction; import org.modelingvalue.collections.util.SerializableQuadFunction.SerializableQuadFunctionImpl; -import org.modelingvalue.collections.util.SerializableSupplier; import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; -import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; public final class Logic { @@ -80,11 +77,13 @@ private static abstract class ClauseImpl extends StructImpl implements Invoca private static final Method EQUALS; private static final Method HASHCODE; private static final Method TO_STRING; + private static final Method GET; static { try { EQUALS = Object.class.getMethod("equals", Object.class); HASHCODE = Object.class.getMethod("hashCode"); TO_STRING = Object.class.getMethod("toString"); + GET = Term.class.getMethod("get", Integer.class); } catch (NoSuchMethodException | SecurityException e) { throw new Error(e); } @@ -107,6 +106,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl return super.hashCode(); } else if (method.equals(TO_STRING)) { return toString(); + } else if (method.equals(GET)) { + return get((Integer) args[0]); } else { throw new Error("No handler for " + method); } @@ -154,6 +155,13 @@ private static final Object[] unproxy(Functor functor, Object[] args) { protected abstract ClauseImpl term(Object[] array); } + private static final Object[] proxy(Object[] array) { + for (int i = 0; i < array.length; i++) { + array[i] = Logic.proxy(array[i]); + } + return array; + } + private static final Object noProxy(Object object) { if (object instanceof Term) { throw new IllegalArgumentException(); @@ -195,13 +203,13 @@ public interface Functor0 extends Functor { } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableSupplier method, SerializableSupplier> impl) { + private static FunctImpl functImpl(SerializableSupplier method, SerializableSupplier> impl) { SerializableSupplierImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } @SuppressWarnings("unchecked") - public static Functor0 functor(SerializableSupplier method, SerializableSupplier> impl) { + public static Functor0 functor(SerializableSupplier method, SerializableSupplier> impl) { return (Functor0) functImpl(method, impl).proxy(); } @@ -211,17 +219,16 @@ public static Functor0 functor(SerializableSupplier method) { } public interface Functor1 extends Functor0 { - A get1(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableFunction method, SerializableFunction> impl) { + private static FunctImpl functImpl(SerializableFunction method, SerializableFunction> impl) { SerializableFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } @SuppressWarnings("unchecked") - public static Functor1 functor(SerializableFunction method, SerializableFunction> impl) { + public static Functor1 functor(SerializableFunction method, SerializableFunction> impl) { return (Functor1) functImpl(method, impl).proxy(); } @@ -231,17 +238,16 @@ public static Functor1 functor(SerializableFunction method) { } public interface Functor2 extends Functor1 { - B get2(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableBiFunction method, SerializableBiFunction> impl) { + private static FunctImpl functImpl(SerializableBiFunction method, SerializableBiFunction> impl) { SerializableBiFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } @SuppressWarnings("unchecked") - public static Functor2 functor(SerializableBiFunction method, SerializableBiFunction> impl) { + public static Functor2 functor(SerializableBiFunction method, SerializableBiFunction> impl) { return (Functor2) functImpl(method, impl.of()).proxy(); } @@ -251,17 +257,16 @@ public static Functor2 functor(SerializableBiFunction extends Functor2 { - C get3(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableTriFunction method, SerializableTriFunction> impl) { + private static FunctImpl functImpl(SerializableTriFunction method, SerializableTriFunction> impl) { SerializableTriFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } @SuppressWarnings("unchecked") - public static Functor3 functor(SerializableTriFunction method, SerializableTriFunction> impl) { + public static Functor3 functor(SerializableTriFunction method, SerializableTriFunction> impl) { return (Functor3) functImpl(method, impl).proxy(); } @@ -271,17 +276,16 @@ public static Functor3 functor(SerializableTriFunction< } public interface Functor4 extends Functor3 { - D get4(); } @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableQuadFunction method, SerializableQuadFunction> impl) { + private static FunctImpl functImpl(SerializableQuadFunction method, SerializableQuadFunction> impl) { SerializableQuadFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } @SuppressWarnings("unchecked") - public static Functor4 functor(SerializableQuadFunction method, SerializableQuadFunction> impl) { + public static Functor4 functor(SerializableQuadFunction method, SerializableQuadFunction> impl) { return (Functor4) functImpl(method, impl).proxy(); } @@ -295,7 +299,7 @@ private static final class FunctImpl extends ClauseImpl> { @SuppressWarnings({"unchecked", "rawtypes"}) private FunctImpl(Class type, String name, List> args, LambdaReflection l) { - super((Class) Functor.class, type, name, args); + super((Class) Functor.class, type, name, args, l); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -328,6 +332,11 @@ protected Class> type() { return (Class>) get(0); } + @SuppressWarnings("unchecked") + protected LambdaReflection lambda() { + return (LambdaReflection) get(4); + } + @SuppressWarnings("unchecked") protected Class functType() { return (Class) get(1); @@ -382,6 +391,7 @@ protected Class type() { // Terms public static interface Term { + Object get(Integer i); } @SuppressWarnings("unchecked") @@ -542,42 +552,62 @@ protected TermImpl setBinding(Map vars) { @SuppressWarnings({"rawtypes", "unchecked"}) protected Collection match(List der) { int non = nrOfNulls(); - if (!USE_EXTEND && (non > 1 || non >= length() - 1)) { + int len = length(); + if (!USE_EXTEND && (non > 1 || non >= len - 1)) { return Set.of(incomplete(der.append(this))); } else { Set facts = FACTS.get(this); if (facts == null) { - List rules = RULES.get(functor()); - if (rules != null) { - int i = der.lastIndexOf(this); - if (i >= 0) { - return Set.of(incomplete(der.sublist(i, der.size()).append(this))); + FunctImpl functor = functor(); + LambdaReflection lambda = functor.lambda(); + if (lambda != null) { + Object[] array = Logic.proxy(toArray()); + if (len == 1) { + return ((Collection) ((Supplier) lambda.original()).get()).map(Logic::unproxy); + } else if (len == 2) { + return ((Collection) ((Function) lambda.original()).apply(array[1])).map(Logic::unproxy); + } else if (len == 3) { + return ((Collection) ((BiFunction) lambda.original()).apply(array[1], array[2])).map(Logic::unproxy); + } else if (len == 4) { + return ((Collection) ((TriFunction) lambda.original()).apply(array[1], array[2], array[3])).map(Logic::unproxy); + } else if (len == 5) { + return ((Collection) ((QuadFunction) lambda.original()).apply(array[1], array[2], array[3], array[4])).map(Logic::unproxy); } else { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this, der.append(this)); - if (non == 0) { - eval = eval.asSet(); - if (eval.equals(Set.of(this))) { - r = eval; - break; + return Set.of(incomplete(List.of(this))); + } + } else { + List rules = RULES.get(functor); + if (rules != null) { + int i = der.lastIndexOf(this); + if (i >= 0) { + return Set.of(incomplete(der.sublist(i, der.size()).append(this))); + } else { + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this, der.append(this)); + if (non == 0) { + eval = eval.asSet(); + if (eval.equals(Set.of(this))) { + r = eval; + break; + } } + r = Collection.concat(r, eval); } - r = Collection.concat(r, eval); - } - if (non < 2 && non < length() - 1) { - Set set = r.asSet(); - FACTS.force(this, set); - for (TermImpl e : set) { - FACTS.force(e, Set.of(e)); + if (non < 2 && non < len - 1) { + Set set = r.asSet(); + FACTS.force(this, set); + for (TermImpl e : set) { + FACTS.force(e, Set.of(e)); + } + return set; + } else { + return r; } - return set; - } else { - return r; } + } else { + return Set.of(); } - } else { - return Set.of(); } } else { return facts; @@ -846,7 +876,7 @@ private static TermImpl incomplete(TermImpl der) { } @SuppressWarnings({"unchecked", "rawtypes"}) - private static Incomplete incomplete(L der) { + public static Incomplete incomplete(L der) { return term(INCOMPLETE_FUNCTOR_PROXY, der); } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 3befdbc0..a39c0e4d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -24,6 +24,7 @@ import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; +import java.math.BigInteger; import java.util.concurrent.ThreadLocalRandom; import org.junit.jupiter.api.RepeatedTest; @@ -72,12 +73,16 @@ static Set> set(Map... bindings) { interface Int extends Term { } - static Functor1 i = functor(LogicTest::i); + static Functor1 i = functor(LogicTest::i); - static Int i(Integer x) { + static Int i(BigInteger x) { return term(i, x); } + static Int i(long x) { + return i(BigInteger.valueOf(x)); + } + static Int iv(String name) { return var(Int.class, name); } @@ -98,7 +103,23 @@ static Int iv(String name) { interface Pred extends Term { } - static Functor3 plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> Set. of()); + @SuppressWarnings({"unchecked", "rawtypes"}) + static Functor3 plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> { + BigInteger ai = a != null ? (BigInteger) a.get(1) : null; + BigInteger bi = b != null ? (BigInteger) b.get(1) : null; + BigInteger ci = c != null ? (BigInteger) c.get(1) : null; + if (ai != null && bi != null && ci != null) { + return ai.add(bi).equals(ci) ? Set.of(plus(a, b, c)) : Set.of(); + } else if (ai != null && bi != null && ci == null) { + return Set.of(plus(i(ai), i(bi), i(ai.add(bi)))); + } else if (ai != null && bi == null && ci != null) { + return Set.of(plus(i(ai), i(ci.subtract(ai)), i(ci))); + } else if (ai == null && bi != null && ci != null) { + return Set.of(plus(i(ci.subtract(bi)), i(bi), i(ci))); + } else { + return (Set) Set.of(incomplete(l(plus(a, b, c)))); + } + }); static Pred plus(Int a, Int b, Int r) { return term(plus, a, b, r); @@ -248,7 +269,7 @@ public void test3() { @RepeatedTest(100) public void test4() { run(() -> { - rule(plus(zero, zero, zero)); + isTrue(plus(one, zero, one)); }); } } From eef5f9129e00067d80bdd7b3bcdcb96e4ab74fa9 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 29 Nov 2024 15:49:19 +0100 Subject: [PATCH 111/179] simplified --- .../java/org/modelingvalue/dclare/Logic.java | 213 +++++++----------- .../modelingvalue/dclare/test/LogicTest.java | 34 +-- 2 files changed, 100 insertions(+), 147 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 0b9d52fc..2ff9ae9c 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -23,11 +23,8 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.util.Arrays; import java.util.Objects; import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Entry; @@ -35,11 +32,15 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; -import org.modelingvalue.collections.util.*; +import org.modelingvalue.collections.util.SerializableBiFunction; import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; +import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.collections.util.SerializableFunction.SerializableFunctionImpl; +import org.modelingvalue.collections.util.SerializableQuadFunction; import org.modelingvalue.collections.util.SerializableQuadFunction.SerializableQuadFunctionImpl; +import org.modelingvalue.collections.util.SerializableSupplier; import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; +import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; public final class Logic { @@ -71,19 +72,17 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); - private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { + private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; private static final Method EQUALS; private static final Method HASHCODE; private static final Method TO_STRING; - private static final Method GET; static { try { EQUALS = Object.class.getMethod("equals", Object.class); HASHCODE = Object.class.getMethod("hashCode"); TO_STRING = Object.class.getMethod("toString"); - GET = Term.class.getMethod("get", Integer.class); } catch (NoSuchMethodException | SecurityException e) { throw new Error(e); } @@ -106,8 +105,6 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl return super.hashCode(); } else if (method.equals(TO_STRING)) { return toString(); - } else if (method.equals(GET)) { - return get((Integer) args[0]); } else { throw new Error("No handler for " + method); } @@ -155,13 +152,6 @@ private static final Object[] unproxy(Functor functor, Object[] args) { protected abstract ClauseImpl term(Object[] array); } - private static final Object[] proxy(Object[] array) { - for (int i = 0; i < array.length; i++) { - array[i] = Logic.proxy(array[i]); - } - return array; - } - private static final Object noProxy(Object object) { if (object instanceof Term) { throw new IllegalArgumentException(); @@ -199,106 +189,91 @@ private static final Object proxy(Object object) { public interface Functor extends Term { } - public interface Functor0 extends Functor { - } - - @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableSupplier method, SerializableSupplier> impl) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static FunctImpl functImpl(SerializableSupplier method, SerializableFunction, Collection> impl) { SerializableSupplierImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - @SuppressWarnings("unchecked") - public static Functor0 functor(SerializableSupplier method, SerializableSupplier> impl) { - return (Functor0) functImpl(method, impl).proxy(); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Functor functor(SerializableSupplier method, SerializableFunction, Collection> impl) { + return functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - public static Functor0 functor(SerializableSupplier method) { - return (Functor0) functImpl(method, null).proxy(); - } - - public interface Functor1 extends Functor0 { + public static Functor functor(SerializableSupplier method) { + return functImpl(method, null).proxy(); } - @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableFunction method, SerializableFunction> impl) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static FunctImpl functImpl(SerializableFunction method, SerializableFunction, Collection> impl) { SerializableFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - @SuppressWarnings("unchecked") - public static Functor1 functor(SerializableFunction method, SerializableFunction> impl) { - return (Functor1) functImpl(method, impl).proxy(); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Functor functor(SerializableFunction method, SerializableFunction, Collection> impl) { + return functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - public static Functor1 functor(SerializableFunction method) { - return (Functor1) functImpl(method, null).proxy(); + public static Functor functor(SerializableFunction method) { + return functImpl(method, null).proxy(); } - public interface Functor2 extends Functor1 { - } - - @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableBiFunction method, SerializableBiFunction> impl) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static FunctImpl functImpl(SerializableBiFunction method, SerializableFunction, Collection> impl) { SerializableBiFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - @SuppressWarnings("unchecked") - public static Functor2 functor(SerializableBiFunction method, SerializableBiFunction> impl) { - return (Functor2) functImpl(method, impl.of()).proxy(); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Functor functor(SerializableBiFunction method, SerializableFunction, Collection> impl) { + return functImpl(method, impl.of()).proxy(); } @SuppressWarnings("unchecked") - public static Functor2 functor(SerializableBiFunction method) { - return (Functor2) functImpl(method, null).proxy(); - } - - public interface Functor3 extends Functor2 { + public static Functor functor(SerializableBiFunction method) { + return functImpl(method, null).proxy(); } - @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableTriFunction method, SerializableTriFunction> impl) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static FunctImpl functImpl(SerializableTriFunction method, SerializableFunction, Collection> impl) { SerializableTriFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - @SuppressWarnings("unchecked") - public static Functor3 functor(SerializableTriFunction method, SerializableTriFunction> impl) { - return (Functor3) functImpl(method, impl).proxy(); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Functor functor(SerializableTriFunction method, SerializableFunction, Collection> impl) { + return functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - public static Functor3 functor(SerializableTriFunction method) { - return (Functor3) functImpl(method, null).proxy(); - } - - public interface Functor4 extends Functor3 { + public static Functor functor(SerializableTriFunction method) { + return functImpl(method, null).proxy(); } - @SuppressWarnings("unchecked") - private static FunctImpl functImpl(SerializableQuadFunction method, SerializableQuadFunction> impl) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static FunctImpl functImpl(SerializableQuadFunction method, SerializableFunction, Collection> impl) { SerializableQuadFunctionImpl l = method.of(); return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); } - @SuppressWarnings("unchecked") - public static Functor4 functor(SerializableQuadFunction method, SerializableQuadFunction> impl) { - return (Functor4) functImpl(method, impl).proxy(); + @SuppressWarnings({"unchecked", "rawtypes"}) + public static Functor functor(SerializableQuadFunction method, SerializableFunction, Collection> impl) { + return functImpl(method, impl).proxy(); } @SuppressWarnings("unchecked") - public static Functor4 functor(SerializableQuadFunction method) { - return (Functor4) functImpl(method, null).proxy(); + public static Functor functor(SerializableQuadFunction method) { + return functImpl(method, null).proxy(); } - private static final class FunctImpl extends ClauseImpl> { + private static final class FunctImpl extends ClauseImpl> { private static final long serialVersionUID = 285147889847599160L; @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Class type, String name, List> args, LambdaReflection l) { + private FunctImpl(Class type, String name, List> args, SerializableFunction, Collection> l) { super((Class) Functor.class, type, name, args, l); } @@ -310,9 +285,7 @@ private FunctImpl(Object[] args) { @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected final Functor proxy() { - int l = length() - 1; - Class f = l == 0 ? Functor0.class : l == 1 ? Functor1.class : l == 2 ? Functor2.class : l == 3 ? Functor3.class : Functor4.class; - return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{f}, this); + return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Functor.class}, this); } @Override @@ -332,9 +305,9 @@ protected Class> type() { return (Class>) get(0); } - @SuppressWarnings("unchecked") - protected LambdaReflection lambda() { - return (LambdaReflection) get(4); + @SuppressWarnings({"unchecked", "rawtypes"}) + protected SerializableFunction, Collection> lambda() { + return (SerializableFunction, Collection>) get(4); } @SuppressWarnings("unchecked") @@ -349,11 +322,11 @@ public static interface Variable extends Term { } @SuppressWarnings("unchecked") - public static F var(Class type, String id) { + public static F var(Class type, String id) { return new VarImpl(type, id).proxy(); } - private static final class VarImpl extends ClauseImpl { + private static final class VarImpl extends ClauseImpl { private static final long serialVersionUID = -8998368070388908726L; private VarImpl(Class type, String name) { @@ -391,39 +364,18 @@ protected Class type() { // Terms public static interface Term { - Object get(Integer i); - } - - @SuppressWarnings("unchecked") - public static F term(Functor0 functor) { - return new TermImpl(functor).proxy(); - } - - @SuppressWarnings("unchecked") - public static F term(Functor1 functor, A a) { - return new TermImpl(functor, a).proxy(); - } - - @SuppressWarnings("unchecked") - public static F term(Functor2 functor, A a, B b) { - return new TermImpl(functor, a, b).proxy(); - } - - @SuppressWarnings("unchecked") - public static F term(Functor3 functor, A a, B b, C c) { - return new TermImpl(functor, a, b, c).proxy(); } @SuppressWarnings("unchecked") - public static F term(Functor4 functor, A a, B b, C c, D d) { - return new TermImpl(functor, a, b, c, d).proxy(); + public static F term(Functor functor, Object... args) { + return new TermImpl(functor, args).proxy(); } private static TermImpl termImpl(FunctImpl functor, Object... args) { return new TermImpl(functor, args); } - private static class TermImpl extends ClauseImpl { + public static class TermImpl extends ClauseImpl { private static final long serialVersionUID = -1605559565948158856L; private TermImpl(Functor functor, Object... args) { @@ -447,7 +399,7 @@ protected F proxy() { @Override @SuppressWarnings("unchecked") protected TermImpl term(Object[] array) { - return new TermImpl((FunctImpl) array[0], Arrays.copyOfRange(array, 1, array.length)); + return new TermImpl(array); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -479,12 +431,10 @@ protected final void makeFact() { if (USE_EXTEND) { patterns(1, array); } else { - Object v; for (int i = 1; i < array.length; i++) { - v = array[i]; array[i] = null; FACTS.force(term(array), ADD_FACT, this); - array[i] = v; + array = toArray(); } } } @@ -533,6 +483,21 @@ protected Map getBinding(TermImpl term) { } } + @SuppressWarnings({"unchecked", "rawtypes"}) + public V get(int... is) { + Object v = this; + for (int i : is) { + v = v != null ? ((TermImpl) v).get(i) : null; + } + return (V) v; + } + + public TermImpl set(int i, Object v) { + Object[] array = toArray(); + array[i] = unproxy(v); + return term(array); + } + @SuppressWarnings("rawtypes") protected TermImpl setBinding(Map vars) { TermImpl inc = (TermImpl) vars.get(INCOMPLETE_VAR); @@ -559,22 +524,9 @@ protected Collection match(List der) { Set facts = FACTS.get(this); if (facts == null) { FunctImpl functor = functor(); - LambdaReflection lambda = functor.lambda(); + SerializableFunction, Collection> lambda = functor.lambda(); if (lambda != null) { - Object[] array = Logic.proxy(toArray()); - if (len == 1) { - return ((Collection) ((Supplier) lambda.original()).get()).map(Logic::unproxy); - } else if (len == 2) { - return ((Collection) ((Function) lambda.original()).apply(array[1])).map(Logic::unproxy); - } else if (len == 3) { - return ((Collection) ((BiFunction) lambda.original()).apply(array[1], array[2])).map(Logic::unproxy); - } else if (len == 4) { - return ((Collection) ((TriFunction) lambda.original()).apply(array[1], array[2], array[3])).map(Logic::unproxy); - } else if (len == 5) { - return ((Collection) ((QuadFunction) lambda.original()).apply(array[1], array[2], array[3], array[4])).map(Logic::unproxy); - } else { - return Set.of(incomplete(List.of(this))); - } + return lambda.apply(this); } else { List rules = RULES.get(functor); if (rules != null) { @@ -850,11 +802,10 @@ public interface Incomplete extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); - @SuppressWarnings("rawtypes") - private static final Functor1 INCOMPLETE_FUNCTOR_PROXY = (Functor1) INCOMPLETE_FUNCTOR.proxy(); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); - private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); + private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); + private static final Functor INCOMPLETE_FUNCTOR_PROXY = INCOMPLETE_FUNCTOR.proxy(); + private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); + private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); @SuppressWarnings("unchecked") public static Incomplete incompleteVar() { @@ -871,7 +822,7 @@ private static TermImpl incomplete(List der) { } @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl incomplete(TermImpl der) { + public static TermImpl incomplete(TermImpl der) { return termImpl(INCOMPLETE_FUNCTOR, der); } @@ -886,15 +837,15 @@ public interface L extends Term { } @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); @SuppressWarnings("rawtypes") - private static final Functor2 LIST_FUNCTOR_2_PROXY = (Functor2) LIST_FUNCTOR_2.proxy(); + private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); + private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); @SuppressWarnings("unchecked") public static L l(E head, L tail) { @@ -912,7 +863,7 @@ public static L l(E... es) { } @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl list(E... es) { + public static TermImpl list(E... es) { TermImpl l = EMPTY_LIST; for (int i = es.length - 1; i >= 0; i--) { l = termImpl(LIST_FUNCTOR_2, unproxy(es[i]), l); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index a39c0e4d..2258dbbd 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -31,9 +31,8 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; -import org.modelingvalue.dclare.Logic.Functor1; -import org.modelingvalue.dclare.Logic.Functor2; -import org.modelingvalue.dclare.Logic.Functor3; +import org.modelingvalue.collections.util.SerializableFunction; +import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -73,7 +72,7 @@ static Set> set(Map... bindings) { interface Int extends Term { } - static Functor1 i = functor(LogicTest::i); + static Functor i = functor((SerializableFunction) LogicTest::i); static Int i(BigInteger x) { return term(i, x); @@ -104,20 +103,20 @@ interface Pred extends Term { } @SuppressWarnings({"unchecked", "rawtypes"}) - static Functor3 plus = functor(LogicTest::plus, (Int a, Int b, Int c) -> { - BigInteger ai = a != null ? (BigInteger) a.get(1) : null; - BigInteger bi = b != null ? (BigInteger) b.get(1) : null; - BigInteger ci = c != null ? (BigInteger) c.get(1) : null; + static Functor plus = functor(LogicTest::plus, t -> { + BigInteger ai = t.get(1, 1); + BigInteger bi = t.get(2, 1); + BigInteger ci = t.get(3, 1); if (ai != null && bi != null && ci != null) { - return ai.add(bi).equals(ci) ? Set.of(plus(a, b, c)) : Set.of(); + return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); } else if (ai != null && bi != null && ci == null) { - return Set.of(plus(i(ai), i(bi), i(ai.add(bi)))); + return Set.of(t.set(3, i(ai.add(bi)))); } else if (ai != null && bi == null && ci != null) { - return Set.of(plus(i(ai), i(ci.subtract(ai)), i(ci))); + return Set.of(t.set(2, i(ci.subtract(ai)))); } else if (ai == null && bi != null && ci != null) { - return Set.of(plus(i(ci.subtract(bi)), i(bi), i(ci))); + return Set.of(t.set(1, i(ci.subtract(bi)))); } else { - return (Set) Set.of(incomplete(l(plus(a, b, c)))); + return Set.of(incomplete(list(t))); } }); @@ -130,7 +129,7 @@ static Pred plus(Int a, Int b, Int r) { interface Person extends Term { } - static Functor1 person = functor(LogicTest::person); + static Functor person = functor(LogicTest::person); static Person person(String name) { return term(person, name); @@ -143,7 +142,7 @@ static Person personVar(String name) { interface ParentChild extends Term { } - static Functor2 parentChild = functor(LogicTest::parentChild); + static Functor parentChild = functor(LogicTest::parentChild); static ParentChild parentChild(Person parent, Person child) { return term(parentChild, parent, child); @@ -156,7 +155,7 @@ static ParentChild parentChildVar(String name) { interface AncestorDescendent extends Term { } - static Functor2 ancestorDescendent = functor(LogicTest::ancestorDescendent); + static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); static AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { return term(ancestorDescendent, ancestor, descendent); @@ -270,6 +269,9 @@ public void test3() { public void test4() { run(() -> { isTrue(plus(one, zero, one)); + isTrue(plus(zero, one, one)); + isTrue(plus(zero, zero, zero)); + hasResult(set(bind(X, one)), plus(zero, one, X)); }); } } From 758a803986d0a3bddfe68c6cc4e75c371224ee2a Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 2 Dec 2024 12:13:14 +0100 Subject: [PATCH 112/179] nested terms in rules --- .../java/org/modelingvalue/dclare/Logic.java | 214 ++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 49 ++-- 2 files changed, 154 insertions(+), 109 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 2ff9ae9c..981785a2 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -65,7 +65,6 @@ private Logic() { return l.append(e); } }; - @SuppressWarnings("rawtypes") private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @@ -316,6 +315,55 @@ protected Class functType() { } } + // Lists + + public interface L extends Term { + } + + @SuppressWarnings("rawtypes") + private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); + @SuppressWarnings("rawtypes") + private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); + @SuppressWarnings("rawtypes") + private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); + @SuppressWarnings("rawtypes") + private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); + @SuppressWarnings("rawtypes") + private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); + + @SuppressWarnings("unchecked") + public static L l(E head, L tail) { + return term(LIST_FUNCTOR_2_PROXY, head, tail); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public static L l() { + return EMPTY_LIST_PROXY; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public static L l(E... es) { + return list(es).proxy(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static TermImpl list(E... es) { + TermImpl l = EMPTY_LIST; + for (int i = es.length - 1; i >= 0; i--) { + l = termImpl(LIST_FUNCTOR_2, unproxy(es[i]), l); + } + return l; + } + + @SuppressWarnings("rawtypes") + private static TermImpl list(List es) { + TermImpl l = EMPTY_LIST; + for (int i = es.size() - 1; i >= 0; i--) { + l = termImpl(LIST_FUNCTOR_2, unproxy(es.get(i)), l); + } + return l; + } + // Variables public static interface Variable extends Term { @@ -468,50 +516,75 @@ protected Map variables() { return vars; } - @SuppressWarnings("rawtypes") - protected Map getBinding(TermImpl term) { - if (term.type() == Incomplete.class) { - return Map.of(Entry.of(INCOMPLETE_VAR, term)); - } else { - Map vars = Map.of(); + @SuppressWarnings({"rawtypes", "unchecked"}) + protected Map getBinding(TermImpl term, Map vars) { + if (get(0).equals(term.get(0))) { for (int i = 1; i < length(); i++) { + Object tv = term.get(i); if (get(i) instanceof VarImpl) { - vars = vars.put((VarImpl) get(i), term.get(i)); + VarImpl var = (VarImpl) get(i); + Object vv = vars.get(var); + if (vv != null) { + if (tv != null && !tv.equals(vv)) { + return null; + } + } else if (tv != null) { + vars = vars.put(var, tv); + } + } else if (get(i) instanceof TermImpl) { + if (tv != null) { + TermImpl t = (TermImpl) get(i); + if (tv instanceof TermImpl) { + vars = t.getBinding((TermImpl) tv, vars); + if (vars == null) { + return null; + } + } else { + return null; + } + } + } else if (tv != null && !tv.equals(get(i))) { + return null; } } return vars; + } else { + return null; } } - @SuppressWarnings({"unchecked", "rawtypes"}) - public V get(int... is) { - Object v = this; - for (int i : is) { - v = v != null ? ((TermImpl) v).get(i) : null; + @SuppressWarnings({"rawtypes", "unchecked"}) + protected TermImpl setBinding(Map vars) { + Object[] array = toArray(); + for (int i = 1; i < length(); i++) { + if (get(i) instanceof VarImpl) { + array[i] = vars.get((VarImpl) get(i)); + } else if (get(i) instanceof TermImpl) { + array[i] = ((TermImpl) get(i)).setBinding(vars); + } } - return (V) v; + return term(array); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public TermImpl getTerm(int i) { + return (TermImpl) super.get(i); + } + + @SuppressWarnings("unchecked") + public V getVal(int i) { + return (V) super.get(i); } public TermImpl set(int i, Object v) { Object[] array = toArray(); - array[i] = unproxy(v); + array[i] = v; return term(array); } - @SuppressWarnings("rawtypes") - protected TermImpl setBinding(Map vars) { - TermImpl inc = (TermImpl) vars.get(INCOMPLETE_VAR); - if (inc != null) { - return inc; - } else { - Object[] array = toArray(); - for (int i = 1; i < length(); i++) { - if (get(i) instanceof VarImpl) { - array[i] = vars.get((VarImpl) get(i)); - } - } - return term(array); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + public Set incomplete() { + return Set.of(Logic.incomplete(Logic.list(this))); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -519,20 +592,19 @@ protected Collection match(List der) { int non = nrOfNulls(); int len = length(); if (!USE_EXTEND && (non > 1 || non >= len - 1)) { - return Set.of(incomplete(der.append(this))); + return Set.of(Logic.incomplete(der.append(this))); } else { Set facts = FACTS.get(this); if (facts == null) { - FunctImpl functor = functor(); - SerializableFunction, Collection> lambda = functor.lambda(); + SerializableFunction, Collection> lambda = functor().lambda(); if (lambda != null) { return lambda.apply(this); } else { - List rules = RULES.get(functor); + List rules = RULES.get(functor()); if (rules != null) { int i = der.lastIndexOf(this); if (i >= 0) { - return Set.of(incomplete(der.sublist(i, der.size()).append(this))); + return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); } else { Collection r = Set.of(); for (RuleImpl rule : rules) { @@ -666,10 +738,18 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection eval(TermImpl ptrn, List der) { + protected Collection eval(TermImpl term, List der) { TermImpl head = term(); - Collection> r = goal().eval(variables().putAll(head.getBinding(ptrn)), der); - return r.map(m -> head.setBinding(m)); + Map binding = head.getBinding(term, Map.of()); + if (binding == null) { + return Set.of(); + } else { + Collection> r = goal().eval(variables().putAll(binding), der); + return r.map(m -> { + TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); + return it != null ? it : head.setBinding(m); + }); + } } @Override @@ -757,7 +837,6 @@ protected List goals() { @SuppressWarnings({"rawtypes", "unchecked"}) private Collection> eval(List goals, Collection> vars, List der) { if (goals.isEmpty()) { - vars = vars.asSet(); return vars; } else { return vars.> flatMap(v -> { @@ -772,9 +851,13 @@ private Collection> eval(List goals, Collection m = f.match(der); - return eval(goals.removeIndex(i), m.map(t -> { - Map b = g.getBinding(t); - return b.containsKey(INCOMPLETE_VAR) ? b : v.putAll(b); + return eval(goals.removeIndex(i), m.> map(t -> { + if (t.type() == Incomplete.class) { + return Map.of(Entry.of(INCOMPLETE_VAR, t)); + } else { + Map b = g.getBinding(t, Map.of()); + return b == null ? Map.of() : v.putAll(b); + } }), der); } }); @@ -831,55 +914,6 @@ public static Incomplete incomplete(L der) { return term(INCOMPLETE_FUNCTOR_PROXY, der); } - // Lists - - public interface L extends Term { - } - - @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); - @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); - @SuppressWarnings("rawtypes") - private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); - @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); - @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); - - @SuppressWarnings("unchecked") - public static L l(E head, L tail) { - return term(LIST_FUNCTOR_2_PROXY, head, tail); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static L l() { - return EMPTY_LIST_PROXY; - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static L l(E... es) { - return list(es).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static TermImpl list(E... es) { - TermImpl l = EMPTY_LIST; - for (int i = es.length - 1; i >= 0; i--) { - l = termImpl(LIST_FUNCTOR_2, unproxy(es[i]), l); - } - return l; - } - - @SuppressWarnings("rawtypes") - private static TermImpl list(List es) { - TermImpl l = EMPTY_LIST; - for (int i = es.size() - 1; i >= 0; i--) { - l = termImpl(LIST_FUNCTOR_2, unproxy(es.get(i)), l); - } - return l; - } - // Facts, Is public static void fact(Term term) { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 2258dbbd..1f669b25 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -34,6 +34,7 @@ import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Term; +import org.modelingvalue.dclare.Logic.TermImpl; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -86,16 +87,20 @@ static Int iv(String name) { return var(Int.class, name); } - Int mOne = i(-1); - Int zero = i(0); - Int one = i(1); + Int mOne = i(-1); + Int zero = i(0); + Int one = i(1); - Int U = iv("U"); - Int V = iv("V"); - Int W = iv("W"); - Int X = iv("X"); - Int Y = iv("Y"); - Int Z = iv("Z"); + Int seven = i(7); + Int three = i(3); + Int ten = i(10); + + Int U = iv("U"); + Int V = iv("V"); + Int W = iv("W"); + Int X = iv("X"); + Int Y = iv("Y"); + Int Z = iv("Z"); // Plus @@ -104,19 +109,22 @@ interface Pred extends Term { @SuppressWarnings({"unchecked", "rawtypes"}) static Functor plus = functor(LogicTest::plus, t -> { - BigInteger ai = t.get(1, 1); - BigInteger bi = t.get(2, 1); - BigInteger ci = t.get(3, 1); + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; if (ai != null && bi != null && ci != null) { return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, i(ai.add(bi)))); + return Set.of(t.set(3, at.set(1, ai.add(bi)))); } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, i(ci.subtract(ai)))); + return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, i(ci.subtract(bi)))); + return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); } else { - return Set.of(incomplete(list(t))); + return t.incomplete(); } }); @@ -268,10 +276,13 @@ public void test3() { @RepeatedTest(100) public void test4() { run(() -> { - isTrue(plus(one, zero, one)); - isTrue(plus(zero, one, one)); isTrue(plus(zero, zero, zero)); - hasResult(set(bind(X, one)), plus(zero, one, X)); + isTrue(plus(one, zero, one)); + isTrue(plus(seven, three, ten)); + hasResult(set(bind(X, ten)), plus(seven, three, X)); + hasResult(set(bind(X, three)), plus(seven, X, ten)); + hasResult(set(bind(X, seven)), plus(X, three, ten)); }); } + } From a58ab8e8c178d7540a4e6d3987664aa84efd8c3f Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 2 Dec 2024 15:18:10 +0100 Subject: [PATCH 113/179] working nested terms --- .../java/org/modelingvalue/dclare/Logic.java | 56 ++++++-- .../modelingvalue/dclare/test/LogicTest.java | 125 ++++++++++++++---- 2 files changed, 144 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 981785a2..8f9017a9 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -268,7 +268,7 @@ public static Functor functor(SerializableQuadFu return functImpl(method, null).proxy(); } - private static final class FunctImpl extends ClauseImpl> { + public static final class FunctImpl extends ClauseImpl> { private static final long serialVersionUID = 285147889847599160L; @SuppressWarnings({"unchecked", "rawtypes"}) @@ -461,14 +461,23 @@ public String toString() { } } + public boolean isAtom() { + for (int i = 1; i < length(); i++) { + if (get(i) instanceof TermImpl) { + return false; + } + } + return true; + } + @SuppressWarnings("unchecked") @Override - protected Class type() { + public Class type() { return functor().functType(); } @SuppressWarnings({"unchecked", "rawtypes"}) - protected FunctImpl functor() { + public FunctImpl functor() { return (FunctImpl) get(0); } @@ -480,7 +489,7 @@ protected final void makeFact() { patterns(1, array); } else { for (int i = 1; i < array.length; i++) { - array[i] = null; + array[i] = getType(i); FACTS.force(term(array), ADD_FACT, this); array = toArray(); } @@ -496,7 +505,7 @@ private void patterns(int i, Object[] array) { } patterns(i + 1, array); if (array[i] != null) { - array[i] = null; + array[i] = getType(i); FACTS.force(term(array), ADD_FACT, this); } patterns(i + 1, array); @@ -508,7 +517,7 @@ protected Map variables() { Map vars = Map.of(); for (int i = 1; i < length(); i++) { if (get(i) instanceof VarImpl) { - vars = vars.put((VarImpl) get(i), null); + vars = vars.put((VarImpl) get(i), ((VarImpl) get(i)).type()); } else if (get(i) instanceof TermImpl) { vars = vars.putAll(((TermImpl) get(i)).variables()); } @@ -521,19 +530,33 @@ protected Map getBinding(TermImpl term, Map if (get(0).equals(term.get(0))) { for (int i = 1; i < length(); i++) { Object tv = term.get(i); + Class tt = tv instanceof TermImpl ? ((TermImpl) tv).type() : tv instanceof Class ? (Class) tv : null; + tv = tv instanceof Class ? null : tv; if (get(i) instanceof VarImpl) { VarImpl var = (VarImpl) get(i); Object vv = vars.get(var); + Class vt = vv instanceof TermImpl ? ((TermImpl) vv).type() : vv instanceof Class ? (Class) vv : null; + vv = vv instanceof Class ? null : vv; if (vv != null) { if (tv != null && !tv.equals(vv)) { return null; } } else if (tv != null) { - vars = vars.put(var, tv); + if (var.type().isAssignableFrom(tt)) { + vars = vars.put(var, tv); + } else { + return null; + } + } else if (tt == null || !var.type().isAssignableFrom(tt)) { + return null; + } else if (vt != null && !vt.equals(tt)) { + return null; + } else { + vars = vars.put(var, tt); } } else if (get(i) instanceof TermImpl) { + TermImpl t = (TermImpl) get(i); if (tv != null) { - TermImpl t = (TermImpl) get(i); if (tv instanceof TermImpl) { vars = t.getBinding((TermImpl) tv, vars); if (vars == null) { @@ -542,6 +565,8 @@ protected Map getBinding(TermImpl term, Map } else { return null; } + } else if (tt == null || !t.type().isAssignableFrom(tt)) { + return null; } } else if (tv != null && !tv.equals(get(i))) { return null; @@ -568,12 +593,20 @@ protected TermImpl setBinding(Map vars) { @SuppressWarnings({"unchecked", "rawtypes"}) public TermImpl getTerm(int i) { - return (TermImpl) super.get(i); + Object v = get(i); + return v instanceof TermImpl ? (TermImpl) v : null; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public Class getType(int i) { + Object v = get(i); + return v instanceof Class ? (Class) v : v instanceof TermImpl ? ((TermImpl) v).type() : null; } @SuppressWarnings("unchecked") public V getVal(int i) { - return (V) super.get(i); + Object v = get(i); + return v instanceof Class || v instanceof TermImpl ? null : (V) v; } public TermImpl set(int i, Object v) { @@ -676,7 +709,8 @@ protected List list() { protected int nrOfNulls() { int nr = 0; for (int i = 1; i < length(); i++) { - if (get(i) == null) { + Object v = get(i); + if (v == null || v instanceof Class) { nr++; } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 1f669b25..cb14e145 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -31,7 +31,10 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.util.SerializableBiFunction; import org.modelingvalue.collections.util.SerializableFunction; +import org.modelingvalue.collections.util.SerializableTriFunction; +import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.TermImpl; @@ -52,11 +55,11 @@ void run(Runnable test) { } static void isTrue(Term... goals) { - assertTrue(is(goals)); + assertTrue(Logic.is(goals)); } static void isFalse(Term... goals) { - assertFalse(is(goals)); + assertFalse(Logic.is(goals)); } static void hasResult(Set> bindings, Term... goals) { @@ -68,39 +71,87 @@ static Set> set(Map... bindings) { return Set.of(bindings); } + // Is + + static Functor is = functor(LogicTest::is); + + static Pred is(Int i, IntLit r) { + return term(is, i, r); + } + // Integer interface Int extends Term { } - static Functor i = functor((SerializableFunction) LogicTest::i); + interface IntLit extends Int { + } + + interface IntFun extends Int { + } + + static Functor i = functor((SerializableFunction) LogicTest::i); - static Int i(BigInteger x) { + static IntLit i(BigInteger x) { return term(i, x); } - static Int i(long x) { + static IntLit i(long x) { return i(BigInteger.valueOf(x)); } + static IntLit ilv(String name) { + return var(IntLit.class, name); + } + + static IntFun ifv(String name) { + return var(IntFun.class, name); + } + static Int iv(String name) { return var(Int.class, name); } - Int mOne = i(-1); - Int zero = i(0); - Int one = i(1); + IntLit mOne = i(-1); + IntLit zero = i(0); + IntLit one = i(1); + + IntLit seven = i(7); + IntLit three = i(3); + IntLit ten = i(10); + + IntLit O = ilv("O"); + IntLit P = ilv("P"); + IntLit Q = ilv("Q"); - Int seven = i(7); - Int three = i(3); - Int ten = i(10); + IntFun U = ifv("U"); + IntFun V = ifv("V"); + IntFun W = ifv("W"); - Int U = iv("U"); - Int V = iv("V"); - Int W = iv("W"); - Int X = iv("X"); - Int Y = iv("Y"); - Int Z = iv("Z"); + Int X = iv("X"); + Int Y = iv("Y"); + Int Z = iv("Z"); + + // Eq + + @SuppressWarnings({"unchecked", "rawtypes"}) + static Functor eq = functor(LogicTest::eq, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + if (at == null && bt == null) { + return t.incomplete(); + } else if (at == null) { + return Set.of(t.set(1, bt)); + } else if (bt == null) { + return Set.of(t.set(2, at)); + } else { + return at.equals(bt) ? Set.of(t) : Set.of(); + } + }); + + static Pred eq(Term a, Term b) { + return term(eq, a, b); + } // Plus @@ -108,10 +159,10 @@ interface Pred extends Term { } @SuppressWarnings({"unchecked", "rawtypes"}) - static Functor plus = functor(LogicTest::plus, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); + static Functor plusPred = functor((SerializableTriFunction) LogicTest::plus, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); BigInteger ai = at != null ? at.getVal(1) : null; BigInteger bi = bt != null ? bt.getVal(1) : null; BigInteger ci = ct != null ? ct.getVal(1) : null; @@ -128,8 +179,14 @@ interface Pred extends Term { } }); - static Pred plus(Int a, Int b, Int r) { - return term(plus, a, b, r); + static Pred plus(IntLit a, IntLit b, IntLit r) { + return term(plusPred, a, b, r); + } + + static Functor plusFunc = functor((SerializableBiFunction) LogicTest::plus); + + static IntFun plus(Int a, Int b) { + return term(plusFunc, a, b); } // FamilyTree @@ -279,9 +336,25 @@ public void test4() { isTrue(plus(zero, zero, zero)); isTrue(plus(one, zero, one)); isTrue(plus(seven, three, ten)); - hasResult(set(bind(X, ten)), plus(seven, three, X)); - hasResult(set(bind(X, three)), plus(seven, X, ten)); - hasResult(set(bind(X, seven)), plus(X, three, ten)); + hasResult(set(bind(P, ten)), plus(seven, three, P)); + hasResult(set(bind(P, three)), plus(seven, P, ten)); + hasResult(set(bind(P, seven)), plus(P, three, ten)); + }); + } + + @RepeatedTest(100) + public void test5() { + + run(() -> { + rule(is(P, Q), eq(P, Q)); + rule(is(plus(X, Y), O), is(X, P), is(Y, Q), plus(P, Q, O)); + + isTrue(is(plus(zero, zero), zero)); + isTrue(is(plus(one, zero), one)); + isTrue(is(plus(seven, three), ten)); + hasResult(set(bind(P, ten)), is(plus(seven, three), P)); + hasResult(set(bind(P, three)), is(plus(seven, P), ten)); + hasResult(set(bind(P, seven)), is(plus(P, three), ten)); }); } From 43c0f092f4a926fbd59e00cfb4f6b9a9db5879bc Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 2 Dec 2024 16:47:55 +0100 Subject: [PATCH 114/179] clarified example --- .../java/org/modelingvalue/dclare/Logic.java | 111 ++++++++++++ .../modelingvalue/dclare/test/LogicTest.java | 167 +++--------------- 2 files changed, 133 insertions(+), 145 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 8f9017a9..6823068b 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -23,6 +23,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.math.BigInteger; import java.util.Objects; import java.util.function.BiFunction; @@ -965,4 +966,114 @@ public static Map bind(Term... varVal) { return b; } + // Is + + private static Functor is = functor((SerializableBiFunction) Logic::is); + + public static Pred is(Int i, IntLit r) { + return term(is, i, r); + } + + // Integer + + public static interface Int extends Term { + } + + public static interface IntLit extends Int { + } + + public static interface IntFun extends Int { + } + + private static Functor i = functor((SerializableFunction) Logic::i); + + private static IntLit i(BigInteger x) { + return term(i, x); + } + + public static IntLit i(long x) { + return i(BigInteger.valueOf(x)); + } + + public static IntLit ilv(String name) { + return var(IntLit.class, name); + } + + public static IntFun ifv(String name) { + return var(IntFun.class, name); + } + + public static Int iv(String name) { + return var(Int.class, name); + } + + // Eq + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor eq = functor(Logic::eq, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + if (at == null && bt == null) { + return t.incomplete(); + } else if (at == null) { + return Set.of(t.set(1, bt)); + } else if (bt == null) { + return Set.of(t.set(2, at)); + } else { + return at.equals(bt) ? Set.of(t) : Set.of(); + } + }); + + public static Pred eq(Term a, Term b) { + return term(eq, a, b); + } + + // Plus + + public static interface Pred extends Term { + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor plusPred = functor((SerializableTriFunction) Logic::plus, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; + if (ai != null && bi != null && ci != null) { + return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); + } else if (ai != null && bi != null && ci == null) { + return Set.of(t.set(3, at.set(1, ai.add(bi)))); + } else if (ai != null && bi == null && ci != null) { + return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); + } else if (ai == null && bi != null && ci != null) { + return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); + } else { + return t.incomplete(); + } + }); + + public static Pred plus(IntLit a, IntLit b, IntLit r) { + return term(plusPred, a, b, r); + } + + private static Functor plusFunc = functor((SerializableBiFunction) Logic::plus); + + public static IntFun plus(Int a, Int b) { + return term(plusFunc, a, b); + } + + public static void isRules() { + IntLit PL = ilv("PL"); + IntLit QL = ilv("QL"); + IntLit RL = ilv("RL"); + + Int X = iv("X"); + Int Y = iv("Y"); + + rule(is(PL, RL), eq(PL, RL)); + rule(is(plus(X, Y), RL), is(X, PL), is(Y, QL), plus(PL, QL, RL)); + } + } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index cb14e145..d4eadd56 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -24,20 +24,16 @@ import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; -import java.math.BigInteger; import java.util.concurrent.ThreadLocalRandom; import org.junit.jupiter.api.RepeatedTest; import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.util.SerializableBiFunction; -import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; +import org.modelingvalue.dclare.Logic.IntLit; import org.modelingvalue.dclare.Logic.Term; -import org.modelingvalue.dclare.Logic.TermImpl; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -71,124 +67,6 @@ static Set> set(Map... bindings) { return Set.of(bindings); } - // Is - - static Functor is = functor(LogicTest::is); - - static Pred is(Int i, IntLit r) { - return term(is, i, r); - } - - // Integer - - interface Int extends Term { - } - - interface IntLit extends Int { - } - - interface IntFun extends Int { - } - - static Functor i = functor((SerializableFunction) LogicTest::i); - - static IntLit i(BigInteger x) { - return term(i, x); - } - - static IntLit i(long x) { - return i(BigInteger.valueOf(x)); - } - - static IntLit ilv(String name) { - return var(IntLit.class, name); - } - - static IntFun ifv(String name) { - return var(IntFun.class, name); - } - - static Int iv(String name) { - return var(Int.class, name); - } - - IntLit mOne = i(-1); - IntLit zero = i(0); - IntLit one = i(1); - - IntLit seven = i(7); - IntLit three = i(3); - IntLit ten = i(10); - - IntLit O = ilv("O"); - IntLit P = ilv("P"); - IntLit Q = ilv("Q"); - - IntFun U = ifv("U"); - IntFun V = ifv("V"); - IntFun W = ifv("W"); - - Int X = iv("X"); - Int Y = iv("Y"); - Int Z = iv("Z"); - - // Eq - - @SuppressWarnings({"unchecked", "rawtypes"}) - static Functor eq = functor(LogicTest::eq, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - if (at == null && bt == null) { - return t.incomplete(); - } else if (at == null) { - return Set.of(t.set(1, bt)); - } else if (bt == null) { - return Set.of(t.set(2, at)); - } else { - return at.equals(bt) ? Set.of(t) : Set.of(); - } - }); - - static Pred eq(Term a, Term b) { - return term(eq, a, b); - } - - // Plus - - interface Pred extends Term { - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - static Functor plusPred = functor((SerializableTriFunction) LogicTest::plus, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null && ci != null) { - return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); - } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, at.set(1, ai.add(bi)))); - } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); - } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); - } else { - return t.incomplete(); - } - }); - - static Pred plus(IntLit a, IntLit b, IntLit r) { - return term(plusPred, a, b, r); - } - - static Functor plusFunc = functor((SerializableBiFunction) LogicTest::plus); - - static IntFun plus(Int a, Int b) { - return term(plusFunc, a, b); - } - // FamilyTree interface Person extends Term { @@ -232,6 +110,8 @@ static AncestorDescendent ancestorDescendentVar(String name) { // Variables + IntLit P = ilv("P"); + Person A = personVar("A"); // Ancestor Person D = personVar("D"); // Descendent Person R = personVar("R"); // Relative @@ -249,7 +129,7 @@ static AncestorDescendent ancestorDescendentVar(String name) { Person Marijn = person("Marijn"); @RepeatedTest(100) - public void test0() { + public void famTest0() { run(() -> { rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -280,7 +160,7 @@ public void test0() { } @RepeatedTest(100) - public void test1() { + public void famTest1() { run(() -> { rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); @@ -300,7 +180,7 @@ public void test1() { } @RepeatedTest(100) - public void test2() { + public void famTest2() { run(() -> { rule(ancestorDescendent(A, D), parentChild(A, D)); rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); @@ -319,7 +199,7 @@ public void test2() { } @RepeatedTest(100) - public void test3() { + public void famTest3() { run(() -> { rule(parentChild(B, C), parentChild(B, C)); @@ -331,30 +211,27 @@ public void test3() { } @RepeatedTest(100) - public void test4() { + public void intTest() { run(() -> { - isTrue(plus(zero, zero, zero)); - isTrue(plus(one, zero, one)); - isTrue(plus(seven, three, ten)); - hasResult(set(bind(P, ten)), plus(seven, three, P)); - hasResult(set(bind(P, three)), plus(seven, P, ten)); - hasResult(set(bind(P, seven)), plus(P, three, ten)); + isTrue(plus(i(11), i(22), i(33))); + + hasResult(set(bind(P, i(10))), plus(i(7), i(3), P)); + hasResult(set(bind(P, i(3))), plus(i(7), P, i(10))); + hasResult(set(bind(P, i(7))), plus(P, i(3), i(10))); }); } @RepeatedTest(100) - public void test5() { - + public void isTest() { run(() -> { - rule(is(P, Q), eq(P, Q)); - rule(is(plus(X, Y), O), is(X, P), is(Y, Q), plus(P, Q, O)); - - isTrue(is(plus(zero, zero), zero)); - isTrue(is(plus(one, zero), one)); - isTrue(is(plus(seven, three), ten)); - hasResult(set(bind(P, ten)), is(plus(seven, three), P)); - hasResult(set(bind(P, three)), is(plus(seven, P), ten)); - hasResult(set(bind(P, seven)), is(plus(P, three), ten)); + isRules(); + isTrue(is(plus(i(11), i(22)), i(33))); + isTrue(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110))); + + hasResult(set(bind(P, i(110))), is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)); + hasResult(set(bind(P, i(10))), is(plus(i(7), i(3)), P)); + hasResult(set(bind(P, i(3))), is(plus(i(7), P), i(10))); + hasResult(set(bind(P, i(7))), is(plus(P, i(3)), i(10))); }); } From 9a8086500c77f9e63f510ce470750059bfcd2da8 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 3 Dec 2024 08:07:19 +0100 Subject: [PATCH 115/179] extra test --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index d4eadd56..df1350bb 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -229,6 +229,7 @@ public void isTest() { isTrue(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110))); hasResult(set(bind(P, i(110))), is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)); + hasResult(set(bind(P, i(33))), is(plus(i(11), plus(plus(i(22), P), i(44))), i(110))); hasResult(set(bind(P, i(10))), is(plus(i(7), i(3)), P)); hasResult(set(bind(P, i(3))), is(plus(i(7), P), i(10))); hasResult(set(bind(P, i(7))), is(plus(P, i(3)), i(10))); From f96a6513e5bcc5b117ddbb73db517846abe9fb62 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 3 Dec 2024 16:35:54 +0100 Subject: [PATCH 116/179] mult power --- .../java/org/modelingvalue/dclare/Logic.java | 88 ++++++++++++++++++- .../modelingvalue/dclare/test/LogicTest.java | 11 ++- 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 6823068b..d5fb93a2 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -1028,7 +1028,7 @@ public static Pred eq(Term a, Term b) { return term(eq, a, b); } - // Plus + // Operators public static interface Pred extends Term { } @@ -1058,12 +1058,93 @@ public static Pred plus(IntLit a, IntLit b, IntLit r) { return term(plusPred, a, b, r); } + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor multiplyPred = functor((SerializableTriFunction) Logic::multiply, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; + if (ai != null && bi != null && ci != null) { + return ai.multiply(bi).equals(ci) ? Set.of(t) : Set.of(); + } else if (ai != null && bi != null && ci == null) { + return Set.of(t.set(3, at.set(1, ai.multiply(bi)))); + } else if (ai != null && bi == null && ci != null) { + return Set.of(t.set(2, at.set(1, ci.divide(ai)))); + } else if (ai == null && bi != null && ci != null) { + return Set.of(t.set(1, bt.set(1, ci.divide(bi)))); + } else { + return t.incomplete(); + } + }); + + public static Pred multiply(IntLit a, IntLit b, IntLit r) { + return term(multiplyPred, a, b, r); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor powerPred = functor((SerializableBiFunction) Logic::power, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + if (ai != null && bi != null) { + return ai.multiply(ai).equals(bi) ? Set.of(t) : Set.of(); + } else if (ai != null && bi == null) { + return Set.of(t.set(2, at.set(1, ai.multiply(ai)))); + } else if (ai == null && bi != null) { + BigInteger sqrt = bi.sqrt(); + return Set.of(t.set(1, bt.set(1, sqrt)), t.set(1, bt.set(1, sqrt.negate()))); + } else { + return t.incomplete(); + } + }); + + public static Pred power(IntLit a, IntLit r) { + return term(powerPred, a, r); + } + + // Functions + private static Functor plusFunc = functor((SerializableBiFunction) Logic::plus); public static IntFun plus(Int a, Int b) { return term(plusFunc, a, b); } + private static Functor minusFunc = functor((SerializableBiFunction) Logic::minus); + + public static IntFun minus(Int a, Int b) { + return term(minusFunc, a, b); + } + + private static Functor multiplyFunc = functor((SerializableBiFunction) Logic::multiply); + + public static IntFun multiply(Int a, Int b) { + return term(multiplyFunc, a, b); + } + + private static Functor divideFunc = functor((SerializableBiFunction) Logic::divide); + + public static IntFun divide(Int a, Int b) { + return term(divideFunc, a, b); + } + + private static Functor powerFunc = functor((SerializableFunction) Logic::power); + + public static IntFun power(Int a) { + return term(powerFunc, a); + } + + private static Functor sqrtFunc = functor((SerializableFunction) Logic::sqrt); + + public static IntFun sqrt(Int a) { + return term(sqrtFunc, a); + } + + // Is Rules + public static void isRules() { IntLit PL = ilv("PL"); IntLit QL = ilv("QL"); @@ -1074,6 +1155,11 @@ public static void isRules() { rule(is(PL, RL), eq(PL, RL)); rule(is(plus(X, Y), RL), is(X, PL), is(Y, QL), plus(PL, QL, RL)); + rule(is(minus(X, Y), RL), is(X, PL), is(Y, QL), plus(RL, QL, PL)); + rule(is(multiply(X, Y), RL), is(X, PL), is(Y, QL), multiply(PL, QL, RL)); + rule(is(divide(X, Y), RL), is(X, PL), is(Y, QL), multiply(RL, QL, PL)); + rule(is(power(X), RL), is(X, PL), power(PL, RL)); + rule(is(sqrt(X), RL), is(X, PL), power(RL, PL)); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index df1350bb..caab1538 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -213,8 +213,6 @@ public void famTest3() { @RepeatedTest(100) public void intTest() { run(() -> { - isTrue(plus(i(11), i(22), i(33))); - hasResult(set(bind(P, i(10))), plus(i(7), i(3), P)); hasResult(set(bind(P, i(3))), plus(i(7), P, i(10))); hasResult(set(bind(P, i(7))), plus(P, i(3), i(10))); @@ -225,14 +223,23 @@ public void intTest() { public void isTest() { run(() -> { isRules(); + isTrue(is(plus(i(11), i(22)), i(33))); + isTrue(is(minus(i(33), i(22)), i(11))); isTrue(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110))); + isTrue(is(plus(i(11), divide(multiply(i(44), i(33)), i(22))), i(77))); + + isTrue(is(sqrt(i(49)), i(7))); + isTrue(is(sqrt(i(49)), i(-7))); + hasResult(set(bind(P, i(110))), is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)); hasResult(set(bind(P, i(33))), is(plus(i(11), plus(plus(i(22), P), i(44))), i(110))); hasResult(set(bind(P, i(10))), is(plus(i(7), i(3)), P)); hasResult(set(bind(P, i(3))), is(plus(i(7), P), i(10))); hasResult(set(bind(P, i(7))), is(plus(P, i(3)), i(10))); + + hasResult(set(bind(P, i(7)), bind(P, i(-7))), is(sqrt(i(49)), P)); }); } From 0d0e9d0fad68e3acc262ae4df27942d2bef20190 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 3 Dec 2024 16:44:54 +0100 Subject: [PATCH 117/179] separate Arithmetic --- .../org/modelingvalue/dclare/Arithmetic.java | 187 ++++++++++++++++ .../java/org/modelingvalue/dclare/Logic.java | 205 ++---------------- .../modelingvalue/dclare/test/LogicTest.java | 9 +- 3 files changed, 208 insertions(+), 193 deletions(-) create mode 100644 src/main/java/org/modelingvalue/dclare/Arithmetic.java diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java new file mode 100644 index 00000000..c7e57c19 --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -0,0 +1,187 @@ +package org.modelingvalue.dclare; + +import java.math.BigInteger; + +import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.util.SerializableBiFunction; +import org.modelingvalue.collections.util.SerializableFunction; +import org.modelingvalue.collections.util.SerializableTriFunction; + +public class Arithmetic extends Logic { + + // Is + + private static Functor is = functor((SerializableBiFunction) Arithmetic::is); + + public static Pred is(Int i, IntLit r) { + return term(is, i, r); + } + + // Integer + + public static interface Int extends Term { + } + + public static interface IntLit extends Int { + } + + public static interface IntFun extends Int { + } + + private static Functor i = functor((SerializableFunction) Arithmetic::i); + + private static IntLit i(BigInteger x) { + return term(i, x); + } + + public static IntLit i(long x) { + return i(BigInteger.valueOf(x)); + } + + public static IntLit ilv(String name) { + return var(IntLit.class, name); + } + + public static IntFun ifv(String name) { + return var(IntFun.class, name); + } + + public static Int iv(String name) { + return var(Int.class, name); + } + + // Operators + + public static interface Pred extends Term { + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor plusPred = functor((SerializableTriFunction) Arithmetic::plus, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; + if (ai != null && bi != null && ci != null) { + return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); + } else if (ai != null && bi != null && ci == null) { + return Set.of(t.set(3, at.set(1, ai.add(bi)))); + } else if (ai != null && bi == null && ci != null) { + return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); + } else if (ai == null && bi != null && ci != null) { + return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); + } else { + return t.incomplete(); + } + }); + + public static Pred plus(IntLit a, IntLit b, IntLit r) { + return term(plusPred, a, b, r); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor multiplyPred = functor((SerializableTriFunction) Arithmetic::multiply, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; + if (ai != null && bi != null && ci != null) { + return ai.multiply(bi).equals(ci) ? Set.of(t) : Set.of(); + } else if (ai != null && bi != null && ci == null) { + return Set.of(t.set(3, at.set(1, ai.multiply(bi)))); + } else if (ai != null && bi == null && ci != null) { + return Set.of(t.set(2, at.set(1, ci.divide(ai)))); + } else if (ai == null && bi != null && ci != null) { + return Set.of(t.set(1, bt.set(1, ci.divide(bi)))); + } else { + return t.incomplete(); + } + }); + + public static Pred multiply(IntLit a, IntLit b, IntLit r) { + return term(multiplyPred, a, b, r); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor powerPred = functor((SerializableBiFunction) Arithmetic::power, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + if (ai != null && bi != null) { + return ai.multiply(ai).equals(bi) ? Set.of(t) : Set.of(); + } else if (ai != null && bi == null) { + return Set.of(t.set(2, at.set(1, ai.multiply(ai)))); + } else if (ai == null && bi != null) { + BigInteger sqrt = bi.sqrt(); + return Set.of(t.set(1, bt.set(1, sqrt)), t.set(1, bt.set(1, sqrt.negate()))); + } else { + return t.incomplete(); + } + }); + + public static Pred power(IntLit a, IntLit r) { + return term(powerPred, a, r); + } + + // Functions + + private static Functor plusFunc = functor((SerializableBiFunction) Arithmetic::plus); + + public static IntFun plus(Int a, Int b) { + return term(plusFunc, a, b); + } + + private static Functor minusFunc = functor((SerializableBiFunction) Arithmetic::minus); + + public static IntFun minus(Int a, Int b) { + return term(minusFunc, a, b); + } + + private static Functor multiplyFunc = functor((SerializableBiFunction) Arithmetic::multiply); + + public static IntFun multiply(Int a, Int b) { + return term(multiplyFunc, a, b); + } + + private static Functor divideFunc = functor((SerializableBiFunction) Arithmetic::divide); + + public static IntFun divide(Int a, Int b) { + return term(divideFunc, a, b); + } + + private static Functor powerFunc = functor((SerializableFunction) Arithmetic::power); + + public static IntFun power(Int a) { + return term(powerFunc, a); + } + + private static Functor sqrtFunc = functor((SerializableFunction) Arithmetic::sqrt); + + public static IntFun sqrt(Int a) { + return term(sqrtFunc, a); + } + + // Is Rules + + public static void rules() { + IntLit PL = ilv("PL"); + IntLit QL = ilv("QL"); + IntLit RL = ilv("RL"); + + Int X = iv("X"); + Int Y = iv("Y"); + + rule(is(PL, RL), eq(PL, RL)); + rule(is(plus(X, Y), RL), is(X, PL), is(Y, QL), plus(PL, QL, RL)); + rule(is(minus(X, Y), RL), is(X, PL), is(Y, QL), plus(RL, QL, PL)); + rule(is(multiply(X, Y), RL), is(X, PL), is(Y, QL), multiply(PL, QL, RL)); + rule(is(divide(X, Y), RL), is(X, PL), is(Y, QL), multiply(RL, QL, PL)); + rule(is(power(X), RL), is(X, PL), power(PL, RL)); + rule(is(sqrt(X), RL), is(X, PL), power(RL, PL)); + } + +} diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index d5fb93a2..62249223 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -23,7 +23,6 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.math.BigInteger; import java.util.Objects; import java.util.function.BiFunction; @@ -43,10 +42,9 @@ import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; +import org.modelingvalue.dclare.Arithmetic.Pred; -public final class Logic { - private Logic() { - } +public class Logic { private static final boolean USE_EXTEND = Boolean.getBoolean("USE_EXTEND"); @@ -161,7 +159,7 @@ private static final Object noProxy(Object object) { } @SuppressWarnings("rawtypes") - private static final Object unproxy(Object object) { + protected static final Object unproxy(Object object) { if (object instanceof Term) { return Proxy.getInvocationHandler(object); } else { @@ -949,68 +947,10 @@ public static Incomplete incomplete(L der) { return term(INCOMPLETE_FUNCTOR_PROXY, der); } - // Facts, Is - - public static void fact(Term term) { - ((TermImpl) unproxy(term)).makeFact(); - } - - // Variable bindings - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Map bind(Term... varVal) { - Map b = Map.of(); - for (int i = 0; i < varVal.length; i += 2) { - b = b.add(Entry.of((Variable) varVal[i], varVal[i + 1])); - } - return b; - } - - // Is - - private static Functor is = functor((SerializableBiFunction) Logic::is); - - public static Pred is(Int i, IntLit r) { - return term(is, i, r); - } - - // Integer - - public static interface Int extends Term { - } - - public static interface IntLit extends Int { - } - - public static interface IntFun extends Int { - } - - private static Functor i = functor((SerializableFunction) Logic::i); - - private static IntLit i(BigInteger x) { - return term(i, x); - } - - public static IntLit i(long x) { - return i(BigInteger.valueOf(x)); - } - - public static IntLit ilv(String name) { - return var(IntLit.class, name); - } - - public static IntFun ifv(String name) { - return var(IntFun.class, name); - } - - public static Int iv(String name) { - return var(Int.class, name); - } - - // Eq + // Equals @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor eq = functor(Logic::eq, t -> { + private static Functor eq = functor(Arithmetic::eq, t -> { TermImpl at = t.getTerm(1); TermImpl bt = t.getTerm(2); if (at == null && bt == null) { @@ -1028,138 +968,21 @@ public static Pred eq(Term a, Term b) { return term(eq, a, b); } - // Operators - - public static interface Pred extends Term { - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor plusPred = functor((SerializableTriFunction) Logic::plus, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null && ci != null) { - return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); - } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, at.set(1, ai.add(bi)))); - } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); - } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); - } else { - return t.incomplete(); - } - }); + // Facts, Is - public static Pred plus(IntLit a, IntLit b, IntLit r) { - return term(plusPred, a, b, r); + public static void fact(Term term) { + ((TermImpl) unproxy(term)).makeFact(); } - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor multiplyPred = functor((SerializableTriFunction) Logic::multiply, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null && ci != null) { - return ai.multiply(bi).equals(ci) ? Set.of(t) : Set.of(); - } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, at.set(1, ai.multiply(bi)))); - } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, at.set(1, ci.divide(ai)))); - } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, bt.set(1, ci.divide(bi)))); - } else { - return t.incomplete(); - } - }); - - public static Pred multiply(IntLit a, IntLit b, IntLit r) { - return term(multiplyPred, a, b, r); - } + // Variable bindings @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor powerPred = functor((SerializableBiFunction) Logic::power, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - if (ai != null && bi != null) { - return ai.multiply(ai).equals(bi) ? Set.of(t) : Set.of(); - } else if (ai != null && bi == null) { - return Set.of(t.set(2, at.set(1, ai.multiply(ai)))); - } else if (ai == null && bi != null) { - BigInteger sqrt = bi.sqrt(); - return Set.of(t.set(1, bt.set(1, sqrt)), t.set(1, bt.set(1, sqrt.negate()))); - } else { - return t.incomplete(); + public static Map bind(Term... varVal) { + Map b = Map.of(); + for (int i = 0; i < varVal.length; i += 2) { + b = b.add(Entry.of((Variable) varVal[i], varVal[i + 1])); } - }); - - public static Pred power(IntLit a, IntLit r) { - return term(powerPred, a, r); - } - - // Functions - - private static Functor plusFunc = functor((SerializableBiFunction) Logic::plus); - - public static IntFun plus(Int a, Int b) { - return term(plusFunc, a, b); - } - - private static Functor minusFunc = functor((SerializableBiFunction) Logic::minus); - - public static IntFun minus(Int a, Int b) { - return term(minusFunc, a, b); - } - - private static Functor multiplyFunc = functor((SerializableBiFunction) Logic::multiply); - - public static IntFun multiply(Int a, Int b) { - return term(multiplyFunc, a, b); - } - - private static Functor divideFunc = functor((SerializableBiFunction) Logic::divide); - - public static IntFun divide(Int a, Int b) { - return term(divideFunc, a, b); - } - - private static Functor powerFunc = functor((SerializableFunction) Logic::power); - - public static IntFun power(Int a) { - return term(powerFunc, a); - } - - private static Functor sqrtFunc = functor((SerializableFunction) Logic::sqrt); - - public static IntFun sqrt(Int a) { - return term(sqrtFunc, a); - } - - // Is Rules - - public static void isRules() { - IntLit PL = ilv("PL"); - IntLit QL = ilv("QL"); - IntLit RL = ilv("RL"); - - Int X = iv("X"); - Int Y = iv("Y"); - - rule(is(PL, RL), eq(PL, RL)); - rule(is(plus(X, Y), RL), is(X, PL), is(Y, QL), plus(PL, QL, RL)); - rule(is(minus(X, Y), RL), is(X, PL), is(Y, QL), plus(RL, QL, PL)); - rule(is(multiply(X, Y), RL), is(X, PL), is(Y, QL), multiply(PL, QL, RL)); - rule(is(divide(X, Y), RL), is(X, PL), is(Y, QL), multiply(RL, QL, PL)); - rule(is(power(X), RL), is(X, PL), power(PL, RL)); - rule(is(sqrt(X), RL), is(X, PL), power(RL, PL)); + return b; } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index caab1538..d07d28f6 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -21,6 +21,8 @@ package org.modelingvalue.dclare.test; import static org.junit.jupiter.api.Assertions.*; +import static org.modelingvalue.dclare.Arithmetic.*; +import static org.modelingvalue.dclare.Arithmetic.is; import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; @@ -30,9 +32,10 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; +import org.modelingvalue.dclare.Arithmetic; +import org.modelingvalue.dclare.Arithmetic.IntLit; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; -import org.modelingvalue.dclare.Logic.IntLit; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -213,6 +216,8 @@ public void famTest3() { @RepeatedTest(100) public void intTest() { run(() -> { + Arithmetic.rules(); + hasResult(set(bind(P, i(10))), plus(i(7), i(3), P)); hasResult(set(bind(P, i(3))), plus(i(7), P, i(10))); hasResult(set(bind(P, i(7))), plus(P, i(3), i(10))); @@ -222,7 +227,7 @@ public void intTest() { @RepeatedTest(100) public void isTest() { run(() -> { - isRules(); + Arithmetic.rules(); isTrue(is(plus(i(11), i(22)), i(33))); isTrue(is(minus(i(33), i(22)), i(11))); From 763f0f92221d85437ba9a47e93c10ee576b8798b Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 4 Dec 2024 09:27:56 +0100 Subject: [PATCH 118/179] incomplete in lambda's priority --- .../java/org/modelingvalue/dclare/Logic.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 62249223..79b93ee4 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -681,13 +681,24 @@ protected int termPrio(List der) { if (facts != null) { return Integer.MIN_VALUE + facts.size(); } else { - List rules = RULES.get(functor()); - if (rules != null) { - if (der.lastIndexOf(this) >= 0) { - return Integer.MAX_VALUE; + SerializableFunction, Collection> lambda = functor().lambda(); + if (lambda != null) { + Collection result = lambda.apply(this); + if (result instanceof Set) { + Set set = (Set) result; + return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); } else { return non; } + } else { + List rules = RULES.get(functor()); + if (rules != null) { + if (der.lastIndexOf(this) >= 0) { + return Integer.MAX_VALUE; + } else { + return non; + } + } } } return Integer.MIN_VALUE; @@ -715,6 +726,10 @@ protected int nrOfNulls() { } return nr; } + + protected boolean isIncomplete() { + return functor() == INCOMPLETE_FUNCTOR; + } }; // Rules From 5ea58b65b1bf9c5d73e95f3ed77d5d80c34e4c57 Mon Sep 17 00:00:00 2001 From: WimBast Date: Wed, 4 Dec 2024 16:32:53 +0100 Subject: [PATCH 119/179] new tests and fixes --- .../org/modelingvalue/dclare/Arithmetic.java | 73 ++++++- .../java/org/modelingvalue/dclare/Logic.java | 87 +++++--- .../modelingvalue/dclare/test/LogicTest.java | 201 ++++++++++-------- 3 files changed, 243 insertions(+), 118 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index c7e57c19..9f5526cf 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -55,6 +55,35 @@ public static Int iv(String name) { public static interface Pred extends Term { } + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Functor compare = functor((SerializableTriFunction) Arithmetic::compare, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); + BigInteger ai = at != null ? at.getVal(1) : null; + BigInteger bi = bt != null ? bt.getVal(1) : null; + BigInteger ci = ct != null ? ct.getVal(1) : null; + if (ai != null && bi != null) { + BigInteger r = BigInteger.valueOf(ai.compareTo(bi)); + if (ci != null) { + return ci.equals(r) ? Set.of(t) : Set.of(); + } else { + return Set.of(t.set(3, at.set(1, r))); + } + } else if (BigInteger.ZERO.equals(ci)) { + if (ai != null) { + return Set.of(t.set(2, at)); + } else if (bi != null) { + return Set.of(t.set(1, bt)); + } + } + return t.incomplete(); + }); + + public static Pred compare(IntLit a, IntLit b, IntLit c) { + return term(compare, a, b, c); + } + @SuppressWarnings({"unchecked", "rawtypes"}) private static Functor plusPred = functor((SerializableTriFunction) Arithmetic::plus, t -> { TermImpl at = t.getTerm(1); @@ -129,6 +158,30 @@ public static Pred power(IntLit a, IntLit r) { // Functions + private static Functor gt = functor(Arithmetic::gt); + + public static Pred gt(Int a, Int b) { + return term(gt, a, b); + } + + private static Functor lt = functor(Arithmetic::lt); + + public static Pred lt(Int a, Int b) { + return term(lt, a, b); + } + + private static Functor ge = functor(Arithmetic::ge); + + public static Pred ge(Int a, Int b) { + return term(ge, a, b); + } + + private static Functor le = functor(Arithmetic::le); + + public static Pred le(Int a, Int b) { + return term(le, a, b); + } + private static Functor plusFunc = functor((SerializableBiFunction) Arithmetic::plus); public static IntFun plus(Int a, Int b) { @@ -175,13 +228,19 @@ public static void rules() { Int X = iv("X"); Int Y = iv("Y"); - rule(is(PL, RL), eq(PL, RL)); - rule(is(plus(X, Y), RL), is(X, PL), is(Y, QL), plus(PL, QL, RL)); - rule(is(minus(X, Y), RL), is(X, PL), is(Y, QL), plus(RL, QL, PL)); - rule(is(multiply(X, Y), RL), is(X, PL), is(Y, QL), multiply(PL, QL, RL)); - rule(is(divide(X, Y), RL), is(X, PL), is(Y, QL), multiply(RL, QL, PL)); - rule(is(power(X), RL), is(X, PL), power(PL, RL)); - rule(is(sqrt(X), RL), is(X, PL), power(RL, PL)); + rule(is(PL, RL), goal(eq(PL, RL))); + rule(is(plus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(PL, QL, RL))); + rule(is(minus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(RL, QL, PL))); + rule(is(multiply(X, Y), RL), goal(is(X, PL), is(Y, QL), multiply(PL, QL, RL))); + rule(is(divide(X, Y), RL), goal(is(X, PL), is(Y, QL), multiply(RL, QL, PL))); + rule(is(power(X), RL), goal(is(X, PL), power(PL, RL))); + rule(is(sqrt(X), RL), goal(is(X, PL), power(RL, PL))); + rule(gt(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(1)))); + rule(lt(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(-1)))); + rule(ge(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(1)))); + rule(ge(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(0)))); + rule(le(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(-1)))); + rule(le(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(0)))); } } diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 79b93ee4..5d5ea16a 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -169,8 +169,8 @@ protected static final Object unproxy(Object object) { } @SuppressWarnings("unchecked") - private static final ClauseImpl unproxy(T object) { - return (ClauseImpl) Proxy.getInvocationHandler(object); + private static final > R unproxy(T object) { + return (R) Proxy.getInvocationHandler(object); } @SuppressWarnings("rawtypes") @@ -440,7 +440,7 @@ private TermImpl(Object[] args) { @Override @SuppressWarnings("unchecked") protected F proxy() { - return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type(), Term.class}, this); + return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type()}, this); } @Override @@ -693,11 +693,14 @@ protected int termPrio(List der) { } else { List rules = RULES.get(functor()); if (rules != null) { - if (der.lastIndexOf(this) >= 0) { - return Integer.MAX_VALUE; - } else { - return non; + for (int i = der.size() - 1; i >= 0; i--) { + TermImpl other = der.get(i); + if (equals(other) || moreNullsThen(other) >= 0) { + return Integer.MAX_VALUE; + } } + return non; + } } } @@ -705,6 +708,33 @@ protected int termPrio(List der) { } } + @SuppressWarnings("rawtypes") + private int moreNullsThen(TermImpl other) { + if (!get(0).equals(other.get(0))) { + return Integer.MIN_VALUE; + } + int[] nr = new int[2]; + for (int i = 1; i < length(); i++) { + if (!Objects.equals(get(i), other.get(i))) { + if (get(i) == null || get(i) instanceof Class) { + nr[0]++; + } else if (other.get(i) == null || other.get(i) instanceof Class) { + nr[1]++; + } else if (get(i) instanceof TermImpl && other.get(i) instanceof TermImpl) { + int r = ((TermImpl) get(i)).moreNullsThen((TermImpl) other.get(i)); + if (r == Integer.MIN_VALUE) { + return Integer.MIN_VALUE; + } else { + nr[0] += r; + } + } else { + return Integer.MIN_VALUE; + } + } + } + return nr[0] - nr[1]; + } + @SuppressWarnings("rawtypes") protected List list() { List l = List.of(); @@ -740,15 +770,10 @@ public static interface Rule extends Term { private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule, null); private static final Functor RULE_FUNCTOR_PROXY = RULE_FUNCTOR.proxy(); - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Rule rule(Term term, Term... goals) { - return rule(term, goal(goals)); - } - @SuppressWarnings({"unchecked", "rawtypes"}) public static Rule rule(Term term, Goal goal) { RuleImpl ruleImpl = new RuleImpl(term, goal); - TermImpl termImpl = (TermImpl) unproxy(term); + TermImpl termImpl = Logic. unproxy(term); RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); return ruleImpl.proxy(); } @@ -820,13 +845,25 @@ public static interface Goal extends Term { private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal, null); private static final Functor GOAL_FUNCTOR_PROXY = GOAL_FUNCTOR.proxy(); - public static boolean is(Term... goals) { - return new GoalImpl(list(goals)).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); + private static GoalImpl getImpl(Goal goal) { + return Logic. unproxy(goal); + } + + public static boolean isTrue(Goal goal) { + return getImpl(goal).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); + } + + public static boolean isFalse(Goal goal) { + return getImpl(goal).eval().isEmpty(); + } + + public static boolean isIncomplete(Goal goal) { + return getImpl(goal).eval().anyMatch(e -> e.containsKey(INCOMPLETE_VAR)); } @SuppressWarnings("rawtypes") - public static Set> eval(Term... goals) { - return new GoalImpl(list(goals)).eval().map(m -> m.asMap(e -> Entry.of((Variable) e.getKey().proxy(), proxy(e.getValue())))).asSet(); + public static Set> getBindings(Goal goal) { + return getImpl(goal).eval().map(m -> m.asMap(e -> Entry.of((Variable) e.getKey().proxy(), proxy(e.getValue())))).asSet(); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -943,10 +980,6 @@ public static Incomplete incompleteVar() { return INCOMPLETE_VAR_PROXY; } - public static Map incomplete(Term... der) { - return Map.of(Entry.of((Variable) incompleteVar(), incomplete(list(der)).proxy())); - } - @SuppressWarnings({"unchecked", "rawtypes"}) private static TermImpl incomplete(List der) { return incomplete(list(der)); @@ -985,14 +1018,18 @@ public static Pred eq(Term a, Term b) { // Facts, Is + @SuppressWarnings({"unchecked", "rawtypes"}) public static void fact(Term term) { - ((TermImpl) unproxy(term)).makeFact(); + Logic. unproxy(term).makeFact(); } - // Variable bindings + // Bindings - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Map bind(Term... varVal) { + public static Map incomplete(Term... der) { + return Map.of(Entry.of((Variable) incompleteVar(), incomplete(list(der)).proxy())); + } + + public static Map binding(Term... varVal) { Map b = Map.of(); for (int i = 0; i < varVal.length; i += 2) { b = b.add(Entry.of((Variable) varVal[i], varVal[i + 1])); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index d07d28f6..b8e6455e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -20,9 +20,9 @@ package org.modelingvalue.dclare.test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.modelingvalue.dclare.Arithmetic.*; -import static org.modelingvalue.dclare.Arithmetic.is; import static org.modelingvalue.dclare.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; @@ -32,10 +32,12 @@ import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; +import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.dclare.Arithmetic; import org.modelingvalue.dclare.Arithmetic.IntLit; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; +import org.modelingvalue.dclare.Logic.Goal; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -53,67 +55,87 @@ void run(Runnable test) { universeTransaction.waitForEnd(); } - static void isTrue(Term... goals) { - assertTrue(Logic.is(goals)); + static void isTrue(Goal goal) { + assertTrue(Logic.isTrue(goal)); } - static void isFalse(Term... goals) { - assertFalse(Logic.is(goals)); + static void isFalse(Goal goal) { + assertTrue(Logic.isFalse(goal)); } - static void hasResult(Set> bindings, Term... goals) { - assertEquals(bindings, eval(goals)); + static void isIncomplete(Goal goal) { + assertTrue(Logic.isIncomplete(goal)); } - @SuppressWarnings({"unchecked", "rawtypes"}) - static Set> set(Map... bindings) { - return Set.of(bindings); + @SafeVarargs + static void hasBindings(Goal goal, Map... bindings) { + assertEquals(Set.of(bindings), getBindings(goal)); } - // FamilyTree + // Root - interface Person extends Term { + interface Root extends Term { } - static Functor person = functor(LogicTest::person); + static Functor root = functor(LogicTest::root); - static Person person(String name) { - return term(person, name); + static Root root(String name) { + return term(root, name); } - static Person personVar(String name) { - return var(Person.class, name); + static Root rootVar(String name) { + return var(Root.class, name); } - interface ParentChild extends Term { + static Functor rootPerson = functor(LogicTest::rootPerson); + + static Term rootPerson(Root root, Person person) { + return term(rootPerson, root, person); } - static Functor parentChild = functor(LogicTest::parentChild); + // FamilyTree - static ParentChild parentChild(Person parent, Person child) { - return term(parentChild, parent, child); + interface Person extends Term { } - static ParentChild parentChildVar(String name) { - return var(ParentChild.class, name); + static Functor strPerson = functor((SerializableFunction) LogicTest::person); + + static Person person(String name) { + return term(strPerson, name); } - interface AncestorDescendent extends Term { + static Functor intPerson = functor((SerializableFunction) LogicTest::person); + + static Person person(IntLit i) { + return term(intPerson, i); } - static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); + static Person person(int i) { + return person(i(i)); + } - static AncestorDescendent ancestorDescendent(Person ancestor, Person descendent) { - return term(ancestorDescendent, ancestor, descendent); + static Person personVar(String name) { + return var(Person.class, name); } - static AncestorDescendent ancestorDescendentVar(String name) { - return var(AncestorDescendent.class, name); + static Functor parentChild = functor(LogicTest::parentChild); + + static Term parentChild(Person parent, Person child) { + return term(parentChild, parent, child); + } + + static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); + + static Term ancestorDescendent(Person ancestor, Person descendent) { + return term(ancestorDescendent, ancestor, descendent); } // Variables + Root U = rootVar("U"); + IntLit P = ilv("P"); + IntLit Q = ilv("Q"); Person A = personVar("A"); // Ancestor Person D = personVar("D"); // Descendent @@ -131,11 +153,13 @@ static AncestorDescendent ancestorDescendentVar(String name) { Person Heleen = person("Heleen"); Person Marijn = person("Marijn"); + Root Root = root("Root"); + @RepeatedTest(100) - public void famTest0() { + public void famTest1() { run(() -> { - rule(ancestorDescendent(A, D), parentChild(A, D)); - rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); + rule(ancestorDescendent(A, D), goal(parentChild(A, D))); + rule(ancestorDescendent(A, D), goal(ancestorDescendent(A, R), parentChild(R, D))); fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); @@ -145,49 +169,29 @@ public void famTest0() { fact(parentChild(Wim, Marijn)); fact(parentChild(Heleen, Marijn)); - isTrue(parentChild(Heleen, Joppe)); - isTrue(parentChild(Jan, Wim)); + isTrue(goal(parentChild(Heleen, Joppe))); + isTrue(goal(parentChild(Jan, Wim))); - isFalse(parentChild(Marijn, Wim)); - isFalse(parentChild(Heleen, Wim)); - isFalse(parentChild(Wim, Wim)); + isFalse(goal(parentChild(Marijn, Wim))); + isFalse(goal(parentChild(Heleen, Wim))); + isFalse(goal(parentChild(Wim, Wim))); - isTrue(ancestorDescendent(Wim, Marijn)); - isTrue(ancestorDescendent(Carel, Marijn)); + isTrue(goal(ancestorDescendent(Wim, Marijn))); + isTrue(goal(ancestorDescendent(Carel, Marijn))); - isFalse(ancestorDescendent(Marijn, Wim)); - isFalse(ancestorDescendent(Heleen, Wim)); - isFalse(ancestorDescendent(Joppe, Carel)); - isFalse(ancestorDescendent(Carel, Carel)); - }); - } - - @RepeatedTest(100) - public void famTest1() { - run(() -> { - rule(ancestorDescendent(A, D), parentChild(A, D)); - rule(ancestorDescendent(A, D), ancestorDescendent(A, R), parentChild(R, D)); - - fact(parentChild(Carel, Jan)); - fact(parentChild(Jan, Wim)); - - isTrue(parentChild(Carel, Jan)); - isTrue(parentChild(Jan, Wim)); - - isFalse(parentChild(Jan, Carel)); - isFalse(parentChild(Wim, Wim)); - - isTrue(ancestorDescendent(Carel, Jan)); - isTrue(ancestorDescendent(Carel, Wim)); + isFalse(goal(ancestorDescendent(Marijn, Wim))); + isFalse(goal(ancestorDescendent(Heleen, Wim))); + isFalse(goal(ancestorDescendent(Joppe, Carel))); + isFalse(goal(ancestorDescendent(Carel, Carel))); }); } @RepeatedTest(100) public void famTest2() { run(() -> { - rule(ancestorDescendent(A, D), parentChild(A, D)); - rule(ancestorDescendent(A, D), parentChild(A, B), parentChild(B, D)); - rule(ancestorDescendent(A, D), parentChild(A, B), ancestorDescendent(B, C), parentChild(C, D)); + rule(ancestorDescendent(A, D), goal(parentChild(A, D))); + rule(ancestorDescendent(A, D), goal(parentChild(A, B), parentChild(B, D))); + rule(ancestorDescendent(A, D), goal(parentChild(A, B), ancestorDescendent(B, C), parentChild(C, D))); Person Carel = person("Carel"); Person Jan = person("Jan"); @@ -196,20 +200,45 @@ public void famTest2() { fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); - hasResult(set(bind(A, Jan), bind(A, Carel)), ancestorDescendent(A, Wim)); - hasResult(set(bind(D, Jan), bind(D, Wim)), ancestorDescendent(Carel, D)); + hasBindings(goal(ancestorDescendent(A, Wim)), binding(A, Jan), binding(A, Carel)); + hasBindings(goal(ancestorDescendent(Carel, D)), binding(D, Jan), binding(D, Wim)); }); } @RepeatedTest(100) public void famTest3() { run(() -> { - rule(parentChild(B, C), parentChild(B, C)); + rule(parentChild(B, C), goal(parentChild(B, C))); Person Jan = person("Jan"); Person Wim = person("Wim"); - hasResult(set(incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))), parentChild(Wim, Jan)); + hasBindings(goal(parentChild(Wim, Jan)), incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))); + isIncomplete(goal(parentChild(Wim, Jan))); + }); + } + + @RepeatedTest(1) + public void famTest4() { + run(() -> { + Arithmetic.rules(); + + rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); + rule(rootPerson(U, person(0)), goal()); + rule(rootPerson(U, D), goal(rootPerson(U, R), parentChild(R, D))); + + isTrue(goal(parentChild(person(0), person(1)))); + isTrue(goal(parentChild(person(3), person(4)))); + isFalse(goal(parentChild(person(4), person(5)))); + + isTrue(goal(rootPerson(Root, person(0)))); + isTrue(goal(rootPerson(Root, person(1)))); + isTrue(goal(rootPerson(Root, person(2)))); + isTrue(goal(rootPerson(Root, person(3)))); + isTrue(goal(rootPerson(Root, person(4)))); + + // hasBindings(goal(rootPerson(Root, D)), binding(D, person(0)), binding(D, person(1)), // + // binding(D, person(2)), binding(D, person(3)), binding(D, person(4))); }); } @@ -218,9 +247,9 @@ public void intTest() { run(() -> { Arithmetic.rules(); - hasResult(set(bind(P, i(10))), plus(i(7), i(3), P)); - hasResult(set(bind(P, i(3))), plus(i(7), P, i(10))); - hasResult(set(bind(P, i(7))), plus(P, i(3), i(10))); + hasBindings(goal(plus(i(7), i(3), P)), binding(P, i(10))); + hasBindings(goal(plus(i(7), P, i(10))), binding(P, i(3))); + hasBindings(goal(plus(P, i(3), i(10))), binding(P, i(7))); }); } @@ -229,22 +258,22 @@ public void isTest() { run(() -> { Arithmetic.rules(); - isTrue(is(plus(i(11), i(22)), i(33))); - isTrue(is(minus(i(33), i(22)), i(11))); - isTrue(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110))); + isTrue(goal(is(plus(i(11), i(22)), i(33)))); + isTrue(goal(is(minus(i(33), i(22)), i(11)))); + isTrue(goal(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110)))); - isTrue(is(plus(i(11), divide(multiply(i(44), i(33)), i(22))), i(77))); + isTrue(goal(is(plus(i(11), divide(multiply(i(44), i(33)), i(22))), i(77)))); - isTrue(is(sqrt(i(49)), i(7))); - isTrue(is(sqrt(i(49)), i(-7))); + isTrue(goal(is(sqrt(i(49)), i(7)))); + isTrue(goal(is(sqrt(i(49)), i(-7)))); - hasResult(set(bind(P, i(110))), is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)); - hasResult(set(bind(P, i(33))), is(plus(i(11), plus(plus(i(22), P), i(44))), i(110))); - hasResult(set(bind(P, i(10))), is(plus(i(7), i(3)), P)); - hasResult(set(bind(P, i(3))), is(plus(i(7), P), i(10))); - hasResult(set(bind(P, i(7))), is(plus(P, i(3)), i(10))); + hasBindings(goal(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)), binding(P, i(110))); + hasBindings(goal(is(plus(i(11), plus(plus(i(22), P), i(44))), i(110))), binding(P, i(33))); + hasBindings(goal(is(plus(i(7), i(3)), P)), binding(P, i(10))); + hasBindings(goal(is(plus(i(7), P), i(10))), binding(P, i(3))); + hasBindings(goal(is(plus(P, i(3)), i(10))), binding(P, i(7))); - hasResult(set(bind(P, i(7)), bind(P, i(-7))), is(sqrt(i(49)), P)); + hasBindings(goal(is(sqrt(i(49)), P)), binding(P, i(7)), binding(P, i(-7))); }); } From 79af91ef9b6c813778ea264800a7aca166315313 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 5 Dec 2024 14:02:39 +0100 Subject: [PATCH 120/179] recursion on cycle --- .../java/org/modelingvalue/dclare/Logic.java | 152 +++++++++--------- .../modelingvalue/dclare/test/LogicTest.java | 4 +- 2 files changed, 79 insertions(+), 77 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 5d5ea16a..cb1244e0 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -46,29 +46,27 @@ public class Logic { - private static final boolean USE_EXTEND = Boolean.getBoolean("USE_EXTEND"); - @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - - private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { - if (l == null) { - return List.of(e); - } else { - int p = e.rulePrio(); - for (int i = 0; i < l.size(); i++) { - if (l.get(i).rulePrio() > p) { - return l.insert(i, e); - } - } - return l.append(e); - } - }; + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + + private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { + if (l == null) { + return List.of(e); + } else { + int p = e.rulePrio(); + for (int i = 0; i < l.size(); i++) { + if (l.get(i).rulePrio() > p) { + return l.insert(i, e); + } + } + return l.append(e); + } + }; @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); + private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -484,30 +482,10 @@ public FunctImpl functor() { protected final void makeFact() { FACTS.force(this, ADD_FACT, this); Object[] array = toArray(); - if (USE_EXTEND) { - patterns(1, array); - } else { - for (int i = 1; i < array.length; i++) { - array[i] = getType(i); - FACTS.force(term(array), ADD_FACT, this); - array = toArray(); - } - } - } - - private void patterns(int i, Object[] array) { - if (i < length()) { - array = array.clone(); - if (array[i] == null) { - array[i] = get(i); - FACTS.force(term(array), ADD_FACT, this); - } - patterns(i + 1, array); - if (array[i] != null) { - array[i] = getType(i); - FACTS.force(term(array), ADD_FACT, this); - } - patterns(i + 1, array); + for (int i = 1; i < array.length; i++) { + array[i] = getType(i); + FACTS.force(term(array), ADD_FACT, this); + array = toArray(); } } @@ -620,10 +598,10 @@ public Set incomplete() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match(List der) { + protected Collection match(List der, Map> rec) { int non = nrOfNulls(); int len = length(); - if (!USE_EXTEND && (non > 1 || non >= len - 1)) { + if (non > 1 || non >= len - 1) { return Set.of(Logic.incomplete(der.append(this))); } else { Set facts = FACTS.get(this); @@ -636,30 +614,30 @@ protected Collection match(List der) { if (rules != null) { int i = der.lastIndexOf(this); if (i >= 0) { - return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); + Set r = rec.get(this); + if (r != null) { + return r; + } else { + return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); + } } else { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this, der.append(this)); - if (non == 0) { - eval = eval.asSet(); - if (eval.equals(Set.of(this))) { - r = eval; - break; - } + der = der.append(this); + Set set = Set.of(), add = Set.of(); + boolean found = false, incomplete = false; + do { + add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add)).removeAll(set); + found = add.anyMatch(this::equalFunctor); + incomplete |= add.anyMatch(this::isIncomplete); + if (incomplete && found && set.isEmpty()) { + add = add.filter(this::equalFunctor).asSet(); } - r = Collection.concat(r, eval); - } - if (non < 2 && non < len - 1) { - Set set = r.asSet(); - FACTS.force(this, set); - for (TermImpl e : set) { - FACTS.force(e, Set.of(e)); - } - return set; - } else { - return r; + set = set.addAll(add); + } while (found && incomplete); + FACTS.force(this, set); + for (TermImpl e : set) { + FACTS.force(e, Set.of(e)); } + return set; } } else { return Set.of(); @@ -671,10 +649,26 @@ protected Collection match(List der) { } } + @SuppressWarnings("rawtypes") + private Set or(List rules, int non, List der, Map> rec) { + Collection r = Set.of(); + for (RuleImpl rule : rules) { + Collection eval = rule.eval(this, der, rec); + if (non == 0) { + eval = eval.asSet(); + if (eval.equals(Set.of(this))) { + return (Set) eval; + } + } + r = Collection.concat(r, eval); + } + return r.asSet(); + } + @SuppressWarnings("rawtypes") protected int termPrio(List der) { int non = nrOfNulls(); - if (!USE_EXTEND && (non > 1 || non >= length() - 1)) { + if (non > 1 || non >= length() - 1) { return Integer.MAX_VALUE; } else { Set facts = FACTS.get(this); @@ -757,6 +751,14 @@ protected int nrOfNulls() { return nr; } + protected boolean equalFunctor(TermImpl other) { + return functor() == other.functor(); + } + + protected boolean isIncomplete(TermImpl other) { + return other.functor() == INCOMPLETE_FUNCTOR && ((TermImpl) other.get(1)).list().contains(this); + } + protected boolean isIncomplete() { return functor() == INCOMPLETE_FUNCTOR; } @@ -811,13 +813,13 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection eval(TermImpl term, List der) { + protected Collection eval(TermImpl term, List der, Map> rec) { TermImpl head = term(); Map binding = head.getBinding(term, Map.of()); if (binding == null) { return Set.of(); } else { - Collection> r = goal().eval(variables().putAll(binding), der); + Collection> r = goal().eval(variables().putAll(binding), der, rec); return r.map(m -> { TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); return it != null ? it : head.setBinding(m); @@ -906,12 +908,12 @@ protected GoalImpl term(Object[] array) { @SuppressWarnings("rawtypes") public Collection> eval() { - return eval(variables(), List.of()); + return eval(variables(), List.of(), Map.of()); } @SuppressWarnings("rawtypes") - protected Collection> eval(Map vars, List der) { - return eval(goals(), Set.of(vars), der); + protected Collection> eval(Map vars, List der, Map> rec) { + return eval(goals(), Set.of(vars), der, rec); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -920,7 +922,7 @@ protected List goals() { } @SuppressWarnings({"rawtypes", "unchecked"}) - private Collection> eval(List goals, Collection> vars, List der) { + private Collection> eval(List goals, Collection> vars, List der, Map> rec) { if (goals.isEmpty()) { return vars; } else { @@ -935,7 +937,7 @@ private Collection> eval(List goals, Collection m = f.match(der); + Collection m = f.match(der, rec); return eval(goals.removeIndex(i), m.> map(t -> { if (t.type() == Incomplete.class) { return Map.of(Entry.of(INCOMPLETE_VAR, t)); @@ -943,7 +945,7 @@ private Collection> eval(List goals, Collection b = g.getBinding(t, Map.of()); return b == null ? Map.of() : v.putAll(b); } - }), der); + }), der, rec); } }); } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index b8e6455e..0d6b9842 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -237,8 +237,8 @@ public void famTest4() { isTrue(goal(rootPerson(Root, person(3)))); isTrue(goal(rootPerson(Root, person(4)))); - // hasBindings(goal(rootPerson(Root, D)), binding(D, person(0)), binding(D, person(1)), // - // binding(D, person(2)), binding(D, person(3)), binding(D, person(4))); + hasBindings(goal(rootPerson(Root, D)), binding(D, person(0)), binding(D, person(1)), // + binding(D, person(2)), binding(D, person(3)), binding(D, person(4))); }); } From 87a5e47677add05c843d0ecb44256eaadb1fcd47 Mon Sep 17 00:00:00 2001 From: automation Date: Thu, 5 Dec 2024 13:03:40 +0000 Subject: [PATCH 121/179] [no-ci] updated by mvgplugin --- .../org/modelingvalue/dclare/Arithmetic.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index 9f5526cf..45fac3e4 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; import java.math.BigInteger; From 2bb26042da3ee72acb5a0c467d3b8406ca1233bd Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 5 Dec 2024 16:57:18 +0100 Subject: [PATCH 122/179] semantic fixes --- .../java/org/modelingvalue/dclare/Logic.java | 168 +++++++++++------- .../modelingvalue/dclare/test/LogicTest.java | 15 +- 2 files changed, 108 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index cb1244e0..867f9a4c 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -46,27 +46,29 @@ public class Logic { + private static final boolean TRACE_LOGIC = Boolean.getBoolean("TRACE_LOGIC"); + @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - - private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { - if (l == null) { - return List.of(e); - } else { - int p = e.rulePrio(); - for (int i = 0; i < l.size(); i++) { - if (l.get(i).rulePrio() > p) { - return l.insert(i, e); - } - } - return l.append(e); - } - }; + private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); + + private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { + if (l == null) { + return List.of(e); + } else { + int p = e.rulePrio(); + for (int i = 0; i < l.size(); i++) { + if (l.get(i).rulePrio() > p) { + return l.insert(i, e); + } + } + return l.append(e); + } + }; @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); + private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); @SuppressWarnings("rawtypes") - private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); + private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { private static final long serialVersionUID = 7315776001191198132L; @@ -598,17 +600,18 @@ public Set incomplete() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match(List der, Map> rec) { + protected Collection match(TermImpl goal, List der, Map> rec) { int non = nrOfNulls(); - int len = length(); - if (non > 1 || non >= len - 1) { + if (non > 1 || non >= totalLength()) { return Set.of(Logic.incomplete(der.append(this))); } else { - Set facts = FACTS.get(this); - if (facts == null) { - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - return lambda.apply(this); + SerializableFunction, Collection> lambda = functor().lambda(); + if (lambda != null) { + return lambda.apply(this); + } else { + Set facts = FACTS.get(this); + if (facts != null) { + return facts; } else { List rules = RULES.get(functor()); if (rules != null) { @@ -643,47 +646,29 @@ protected Collection match(List der, Map or(List rules, int non, List der, Map> rec) { - Collection r = Set.of(); - for (RuleImpl rule : rules) { - Collection eval = rule.eval(this, der, rec); - if (non == 0) { - eval = eval.asSet(); - if (eval.equals(Set.of(this))) { - return (Set) eval; - } - } - r = Collection.concat(r, eval); - } - return r.asSet(); - } - - @SuppressWarnings("rawtypes") - protected int termPrio(List der) { + protected int termPrio(TermImpl goal, List der) { int non = nrOfNulls(); - if (non > 1 || non >= length() - 1) { + if (non > 1 || non >= totalLength()) { return Integer.MAX_VALUE; } else { - Set facts = FACTS.get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); + SerializableFunction, Collection> lambda = functor().lambda(); + if (lambda != null) { + Collection result = lambda.apply(this); + if (result instanceof Set) { + Set set = (Set) result; + return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); + } else { + return non; + } } else { - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - Collection result = lambda.apply(this); - if (result instanceof Set) { - Set set = (Set) result; - return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); - } else { - return non; - } + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); } else { List rules = RULES.get(functor()); if (rules != null) { @@ -693,15 +678,28 @@ protected int termPrio(List der) { return Integer.MAX_VALUE; } } - return non; - + return non - nrOfBindings(goal); + } else { + return Integer.MIN_VALUE; } } } - return Integer.MIN_VALUE; } } + @SuppressWarnings("rawtypes") + private Set or(List rules, int non, List der, Map> rec) { + Set r = Set.of(); + for (RuleImpl rule : rules) { + Set eval = rule.eval(this, der, rec); + if (non == 0 && eval.equals(Set.of(this))) { + return (Set) eval; + } + r = r.addAll(eval); + } + return r; + } + @SuppressWarnings("rawtypes") private int moreNullsThen(TermImpl other) { if (!get(0).equals(other.get(0))) { @@ -740,21 +738,54 @@ protected List list() { return l; } + @SuppressWarnings("rawtypes") protected int nrOfNulls() { int nr = 0; for (int i = 1; i < length(); i++) { Object v = get(i); if (v == null || v instanceof Class) { nr++; + } else if (v instanceof TermImpl) { + nr += ((TermImpl) v).nrOfNulls(); } } return nr; } + @SuppressWarnings("rawtypes") + protected int totalLength() { + int nr = 0; + for (int i = 1; i < length(); i++) { + Object v = get(i); + if (v instanceof TermImpl) { + nr += ((TermImpl) v).totalLength(); + } + nr++; + } + return nr; + } + + @SuppressWarnings("rawtypes") + protected int nrOfBindings(TermImpl goal) { + int nr = 0; + for (int i = 1; i < length(); i++) { + Object g = goal.get(i); + Object v = get(i); + if (g instanceof VarImpl && !(v == null || v instanceof Class)) { + nr++; + } else if (g instanceof TermImpl && v instanceof TermImpl) { + nr += ((TermImpl) v).nrOfBindings((TermImpl) g); + } + } + return nr; + } + + @SuppressWarnings("rawtypes") protected boolean equalFunctor(TermImpl other) { return functor() == other.functor(); } + @SuppressWarnings("rawtypes") protected boolean isIncomplete(TermImpl other) { return other.functor() == INCOMPLETE_FUNCTOR && ((TermImpl) other.get(1)).list().contains(this); } @@ -813,17 +844,20 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection eval(TermImpl term, List der, Map> rec) { + protected Set eval(TermImpl term, List der, Map> rec) { TermImpl head = term(); Map binding = head.getBinding(term, Map.of()); if (binding == null) { return Set.of(); } else { + if (TRACE_LOGIC) { + System.err.println("!!!!!!!!!!!!!! " + " ".repeat(der.size()) + this + " " + binding.toString().substring(3)); + } Collection> r = goal().eval(variables().putAll(binding), der, rec); return r.map(m -> { TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); return it != null ? it : head.setBinding(m); - }); + }).asSet(); } } @@ -934,10 +968,10 @@ private Collection> eval(List goals, Collection m = f.match(der, rec); + Collection m = f.match(g, der, rec); return eval(goals.removeIndex(i), m.> map(t -> { if (t.type() == Incomplete.class) { return Map.of(Entry.of(INCOMPLETE_VAR, t)); @@ -952,11 +986,11 @@ private Collection> eval(List goals, Collection list, List der) { + private static int first(List actual, List goals, List der) { int first = -1; int min = Integer.MAX_VALUE; - for (int i = 0; i < list.size(); i++) { - int prio = list.get(i).termPrio(der); + for (int i = 0; i < actual.size(); i++) { + int prio = actual.get(i).termPrio(goals.get(i), der); if (first == -1 || prio < min) { first = i; min = prio; diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 0d6b9842..9e4ea36e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -137,11 +137,11 @@ static Term ancestorDescendent(Person ancestor, Person descendent) { IntLit P = ilv("P"); IntLit Q = ilv("Q"); - Person A = personVar("A"); // Ancestor - Person D = personVar("D"); // Descendent - Person R = personVar("R"); // Relative - Person B = personVar("B"); // Relative1 - Person C = personVar("C"); // Relative2 + Person A = personVar("A"); + Person D = personVar("D"); + Person R = personVar("R"); + Person B = personVar("B"); + Person C = personVar("C"); // Terms @@ -190,8 +190,7 @@ public void famTest1() { public void famTest2() { run(() -> { rule(ancestorDescendent(A, D), goal(parentChild(A, D))); - rule(ancestorDescendent(A, D), goal(parentChild(A, B), parentChild(B, D))); - rule(ancestorDescendent(A, D), goal(parentChild(A, B), ancestorDescendent(B, C), parentChild(C, D))); + rule(ancestorDescendent(A, D), goal(ancestorDescendent(A, C), parentChild(C, D))); Person Carel = person("Carel"); Person Jan = person("Jan"); @@ -218,7 +217,7 @@ public void famTest3() { }); } - @RepeatedTest(1) + @RepeatedTest(100) public void famTest4() { run(() -> { Arithmetic.rules(); From fa1a4afe6be368a53ebd4d51152c4594a24e2523 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 09:26:38 +0100 Subject: [PATCH 123/179] use rec in prio --- .../java/org/modelingvalue/dclare/Logic.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 867f9a4c..ffdb5a1a 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -651,7 +651,7 @@ protected Collection match(TermImpl goal, List der, Map der) { + protected int termPrio(TermImpl goal, List der, Map> rec) { int non = nrOfNulls(); if (non > 1 || non >= totalLength()) { return Integer.MAX_VALUE; @@ -672,13 +672,18 @@ protected int termPrio(TermImpl goal, List der) { } else { List rules = RULES.get(functor()); if (rules != null) { - for (int i = der.size() - 1; i >= 0; i--) { - TermImpl other = der.get(i); - if (equals(other) || moreNullsThen(other) >= 0) { - return Integer.MAX_VALUE; + Set r = rec.get(this); + if (r != null) { + return Integer.MIN_VALUE + r.size(); + } else { + for (int i = der.size() - 1; i >= 0; i--) { + TermImpl other = der.get(i); + if (equals(other) || moreNullsThen(other) >= 0) { + return Integer.MAX_VALUE; + } } + return non - nrOfBindings(goal); } - return non - nrOfBindings(goal); } else { return Integer.MIN_VALUE; } @@ -968,7 +973,7 @@ private Collection> eval(List goals, Collection m = f.match(g, der, rec); @@ -986,11 +991,11 @@ private Collection> eval(List goals, Collection actual, List goals, List der) { + private static int first(List actual, List goals, List der, Map> rec) { int first = -1; int min = Integer.MAX_VALUE; for (int i = 0; i < actual.size(); i++) { - int prio = actual.get(i).termPrio(goals.get(i), der); + int prio = actual.get(i).termPrio(goals.get(i), der, rec); if (first == -1 || prio < min) { first = i; min = prio; From b54ef02bf28982bba7c2cc8b0b73260d409d90c3 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 09:50:34 +0100 Subject: [PATCH 124/179] Predicates --- .../org/modelingvalue/dclare/Arithmetic.java | 93 ++++---- .../java/org/modelingvalue/dclare/Logic.java | 211 ++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 23 +- 3 files changed, 156 insertions(+), 171 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index 45fac3e4..a830253f 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -31,9 +31,9 @@ public class Arithmetic extends Logic { // Is - private static Functor is = functor((SerializableBiFunction) Arithmetic::is); + private static Functor is = functor((SerializableBiFunction) Arithmetic::is); - public static Pred is(Int i, IntLit r) { + public static Pred is(Int i, IntAtom r) { return term(is, i, r); } @@ -42,28 +42,28 @@ public static Pred is(Int i, IntLit r) { public static interface Int extends Term { } - public static interface IntLit extends Int { + public static interface IntAtom extends Int { } - public static interface IntFun extends Int { + public static interface IntFunc extends Int { } - private static Functor i = functor((SerializableFunction) Arithmetic::i); + private static Functor i = functor((SerializableFunction) Arithmetic::i); - private static IntLit i(BigInteger x) { + private static IntAtom i(BigInteger x) { return term(i, x); } - public static IntLit i(long x) { + public static IntAtom i(long x) { return i(BigInteger.valueOf(x)); } - public static IntLit ilv(String name) { - return var(IntLit.class, name); + public static IntAtom ilv(String name) { + return var(IntAtom.class, name); } - public static IntFun ifv(String name) { - return var(IntFun.class, name); + public static IntFunc ifv(String name) { + return var(IntFunc.class, name); } public static Int iv(String name) { @@ -72,14 +72,11 @@ public static Int iv(String name) { // Operators - public static interface Pred extends Term { - } - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor compare = functor((SerializableTriFunction) Arithmetic::compare, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); + private static Functor compare = functor((SerializableTriFunction) Arithmetic::compare, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); BigInteger ai = at != null ? at.getVal(1) : null; BigInteger bi = bt != null ? bt.getVal(1) : null; BigInteger ci = ct != null ? ct.getVal(1) : null; @@ -100,15 +97,15 @@ public static interface Pred extends Term { return t.incomplete(); }); - public static Pred compare(IntLit a, IntLit b, IntLit c) { + public static Pred compare(IntAtom a, IntAtom b, IntAtom c) { return term(compare, a, b, c); } @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor plusPred = functor((SerializableTriFunction) Arithmetic::plus, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); + private static Functor plusPred = functor((SerializableTriFunction) Arithmetic::plus, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); BigInteger ai = at != null ? at.getVal(1) : null; BigInteger bi = bt != null ? bt.getVal(1) : null; BigInteger ci = ct != null ? ct.getVal(1) : null; @@ -125,15 +122,15 @@ public static Pred compare(IntLit a, IntLit b, IntLit c) { } }); - public static Pred plus(IntLit a, IntLit b, IntLit r) { + public static Pred plus(IntAtom a, IntAtom b, IntAtom r) { return term(plusPred, a, b, r); } @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor multiplyPred = functor((SerializableTriFunction) Arithmetic::multiply, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); + private static Functor multiplyPred = functor((SerializableTriFunction) Arithmetic::multiply, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); + TermImpl ct = t.getTerm(3); BigInteger ai = at != null ? at.getVal(1) : null; BigInteger bi = bt != null ? bt.getVal(1) : null; BigInteger ci = ct != null ? ct.getVal(1) : null; @@ -150,14 +147,14 @@ public static Pred plus(IntLit a, IntLit b, IntLit r) { } }); - public static Pred multiply(IntLit a, IntLit b, IntLit r) { + public static Pred multiply(IntAtom a, IntAtom b, IntAtom r) { return term(multiplyPred, a, b, r); } @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor powerPred = functor((SerializableBiFunction) Arithmetic::power, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); + private static Functor powerPred = functor((SerializableBiFunction) Arithmetic::power, t -> { + TermImpl at = t.getTerm(1); + TermImpl bt = t.getTerm(2); BigInteger ai = at != null ? at.getVal(1) : null; BigInteger bi = bt != null ? bt.getVal(1) : null; if (ai != null && bi != null) { @@ -172,7 +169,7 @@ public static Pred multiply(IntLit a, IntLit b, IntLit r) { } }); - public static Pred power(IntLit a, IntLit r) { + public static Pred power(IntAtom a, IntAtom r) { return term(powerPred, a, r); } @@ -202,48 +199,48 @@ public static Pred le(Int a, Int b) { return term(le, a, b); } - private static Functor plusFunc = functor((SerializableBiFunction) Arithmetic::plus); + private static Functor plusFunc = functor((SerializableBiFunction) Arithmetic::plus); - public static IntFun plus(Int a, Int b) { + public static IntFunc plus(Int a, Int b) { return term(plusFunc, a, b); } - private static Functor minusFunc = functor((SerializableBiFunction) Arithmetic::minus); + private static Functor minusFunc = functor((SerializableBiFunction) Arithmetic::minus); - public static IntFun minus(Int a, Int b) { + public static IntFunc minus(Int a, Int b) { return term(minusFunc, a, b); } - private static Functor multiplyFunc = functor((SerializableBiFunction) Arithmetic::multiply); + private static Functor multiplyFunc = functor((SerializableBiFunction) Arithmetic::multiply); - public static IntFun multiply(Int a, Int b) { + public static IntFunc multiply(Int a, Int b) { return term(multiplyFunc, a, b); } - private static Functor divideFunc = functor((SerializableBiFunction) Arithmetic::divide); + private static Functor divideFunc = functor((SerializableBiFunction) Arithmetic::divide); - public static IntFun divide(Int a, Int b) { + public static IntFunc divide(Int a, Int b) { return term(divideFunc, a, b); } - private static Functor powerFunc = functor((SerializableFunction) Arithmetic::power); + private static Functor powerFunc = functor((SerializableFunction) Arithmetic::power); - public static IntFun power(Int a) { + public static IntFunc power(Int a) { return term(powerFunc, a); } - private static Functor sqrtFunc = functor((SerializableFunction) Arithmetic::sqrt); + private static Functor sqrtFunc = functor((SerializableFunction) Arithmetic::sqrt); - public static IntFun sqrt(Int a) { + public static IntFunc sqrt(Int a) { return term(sqrtFunc, a); } // Is Rules public static void rules() { - IntLit PL = ilv("PL"); - IntLit QL = ilv("QL"); - IntLit RL = ilv("RL"); + IntAtom PL = ilv("PL"); + IntAtom QL = ilv("QL"); + IntAtom RL = ilv("RL"); Int X = iv("X"); Int Y = iv("Y"); diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index ffdb5a1a..32015e42 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -42,7 +42,6 @@ import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; -import org.modelingvalue.dclare.Arithmetic.Pred; public class Logic { @@ -413,6 +412,9 @@ protected Class type() { public static interface Term { } + public static interface Pred extends Term { + } + @SuppressWarnings("unchecked") public static F term(Functor functor, Object... args) { return new TermImpl(functor, args).proxy(); @@ -604,50 +606,44 @@ protected Collection match(TermImpl goal, List der, Map 1 || non >= totalLength()) { return Set.of(Logic.incomplete(der.append(this))); - } else { - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - return lambda.apply(this); - } else { - Set facts = FACTS.get(this); - if (facts != null) { - return facts; - } else { - List rules = RULES.get(functor()); - if (rules != null) { - int i = der.lastIndexOf(this); - if (i >= 0) { - Set r = rec.get(this); - if (r != null) { - return r; - } else { - return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); - } - } else { - der = der.append(this); - Set set = Set.of(), add = Set.of(); - boolean found = false, incomplete = false; - do { - add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add)).removeAll(set); - found = add.anyMatch(this::equalFunctor); - incomplete |= add.anyMatch(this::isIncomplete); - if (incomplete && found && set.isEmpty()) { - add = add.filter(this::equalFunctor).asSet(); - } - set = set.addAll(add); - } while (found && incomplete); - FACTS.force(this, set); - for (TermImpl e : set) { - FACTS.force(e, Set.of(e)); - } - return set; - } - } else { - return Set.of(); - } + } + SerializableFunction, Collection> lambda = functor().lambda(); + if (lambda != null) { + return lambda.apply(this); + } + Set facts = FACTS.get(this); + if (facts != null) { + return facts; + } + List rules = RULES.get(functor()); + if (rules != null) { + Set r = rec.get(this); + if (r != null) { + return r; + } + int i = der.lastIndexOf(this); + if (i >= 0) { + return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); + } + der = der.append(this); + Set set = Set.of(), add = Set.of(); + boolean found = false, incomplete = false; + do { + add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add)).removeAll(set); + found = add.anyMatch(this::equalFunctor); + incomplete |= add.anyMatch(this::isIncomplete); + if (incomplete && found && set.isEmpty()) { + add = add.filter(this::equalFunctor).asSet(); } + set = set.addAll(add); + } while (found && incomplete); + FACTS.force(this, set); + for (TermImpl e : set) { + FACTS.force(e, Set.of(e)); } + return set; } + return Set.of(); } @SuppressWarnings("rawtypes") @@ -655,41 +651,35 @@ protected int termPrio(TermImpl goal, List der, Map 1 || non >= totalLength()) { return Integer.MAX_VALUE; - } else { - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - Collection result = lambda.apply(this); - if (result instanceof Set) { - Set set = (Set) result; - return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); - } else { - return non; - } - } else { - Set facts = FACTS.get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); - } else { - List rules = RULES.get(functor()); - if (rules != null) { - Set r = rec.get(this); - if (r != null) { - return Integer.MIN_VALUE + r.size(); - } else { - for (int i = der.size() - 1; i >= 0; i--) { - TermImpl other = der.get(i); - if (equals(other) || moreNullsThen(other) >= 0) { - return Integer.MAX_VALUE; - } - } - return non - nrOfBindings(goal); - } - } else { - return Integer.MIN_VALUE; - } + } + SerializableFunction, Collection> lambda = functor().lambda(); + if (lambda != null) { + Collection result = lambda.apply(this); + if (result instanceof Set) { + Set set = (Set) result; + return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); + } + return non; + } + Set facts = FACTS.get(this); + if (facts != null) { + return Integer.MIN_VALUE + facts.size(); + } + List rules = RULES.get(functor()); + if (rules != null) { + Set r = rec.get(this); + if (r != null) { + return Integer.MIN_VALUE + r.size(); + } + for (int i = der.size() - 1; i >= 0; i--) { + TermImpl other = der.get(i); + if (equals(other) || moreNullsThen(other) >= 0) { + return Integer.MAX_VALUE; } } + return non - nrOfBindings(goal); } + return Integer.MIN_VALUE; } @SuppressWarnings("rawtypes") @@ -805,13 +795,13 @@ protected boolean isIncomplete() { public static interface Rule extends Term { } - private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule, null); + private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule, null); private static final Functor RULE_FUNCTOR_PROXY = RULE_FUNCTOR.proxy(); @SuppressWarnings({"unchecked", "rawtypes"}) - public static Rule rule(Term term, Goal goal) { - RuleImpl ruleImpl = new RuleImpl(term, goal); - TermImpl termImpl = Logic. unproxy(term); + public static Rule rule(Pred pred, Goal goal) { + RuleImpl ruleImpl = new RuleImpl(pred, goal); + TermImpl termImpl = Logic. unproxy(pred); RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); return ruleImpl.proxy(); } @@ -854,16 +844,15 @@ protected Set eval(TermImpl term, List der, Map binding = head.getBinding(term, Map.of()); if (binding == null) { return Set.of(); - } else { - if (TRACE_LOGIC) { - System.err.println("!!!!!!!!!!!!!! " + " ".repeat(der.size()) + this + " " + binding.toString().substring(3)); - } - Collection> r = goal().eval(variables().putAll(binding), der, rec); - return r.map(m -> { - TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); - return it != null ? it : head.setBinding(m); - }).asSet(); } + if (TRACE_LOGIC) { + System.err.println("!!!!!!!!!!!!!! " + " ".repeat(der.size()) + this + " " + binding.toString().substring(3)); + } + Collection> r = goal().eval(variables().putAll(binding), der, rec); + return r.map(m -> { + TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); + return it != null ? it : head.setBinding(m); + }).asSet(); } @Override @@ -908,19 +897,19 @@ public static Set> getBindings(Goal goal) { } @SuppressWarnings({"unchecked", "rawtypes"}) - public static Goal goal(Term... goals) { + public static Goal goal(Pred... goals) { return new GoalImpl(list(goals)).proxy(); } @SuppressWarnings("unchecked") - public static Goal goal(L goals) { + public static Goal goal(L goals) { return new GoalImpl(goals).proxy(); } private static final class GoalImpl extends TermImpl { private static final long serialVersionUID = -4100263206389367132L; - private GoalImpl(L goals) { + private GoalImpl(L goals) { super(GOAL_FUNCTOR_PROXY, goals); } @@ -964,30 +953,28 @@ protected List goals() { private Collection> eval(List goals, Collection> vars, List der, Map> rec) { if (goals.isEmpty()) { return vars; - } else { - return vars.> flatMap(v -> { - if (v.containsKey(INCOMPLETE_VAR)) { - return Set.of(v); + } + return vars.> flatMap(v -> { + if (v.containsKey(INCOMPLETE_VAR)) { + return Set.of(v); + } + List actual = List.of(); + for (TermImpl g : goals) { + actual = actual.add(g.setBinding(v)); + } + int i = first(actual, goals, der, rec); + TermImpl f = actual.get(i); + TermImpl g = goals.get(i); + Collection m = f.match(g, der, rec); + return eval(goals.removeIndex(i), m.> map(t -> { + if (t.type() == Incomplete.class) { + return Map.of(Entry.of(INCOMPLETE_VAR, t)); } else { - List actual = List.of(); - for (TermImpl g : goals) { - actual = actual.add(g.setBinding(v)); - } - int i = first(actual, goals, der, rec); - TermImpl f = actual.get(i); - TermImpl g = goals.get(i); - Collection m = f.match(g, der, rec); - return eval(goals.removeIndex(i), m.> map(t -> { - if (t.type() == Incomplete.class) { - return Map.of(Entry.of(INCOMPLETE_VAR, t)); - } else { - Map b = g.getBinding(t, Map.of()); - return b == null ? Map.of() : v.putAll(b); - } - }), der, rec); + Map b = g.getBinding(t, Map.of()); + return b == null ? Map.of() : v.putAll(b); } - }); - } + }), der, rec); + }); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 9e4ea36e..8cdf2ec2 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -34,10 +34,11 @@ import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.dclare.Arithmetic; -import org.modelingvalue.dclare.Arithmetic.IntLit; +import org.modelingvalue.dclare.Arithmetic.IntAtom; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Goal; +import org.modelingvalue.dclare.Logic.Pred; import org.modelingvalue.dclare.Logic.Term; import org.modelingvalue.dclare.Logic.Variable; import org.modelingvalue.dclare.Universe; @@ -87,9 +88,9 @@ static Root rootVar(String name) { return var(Root.class, name); } - static Functor rootPerson = functor(LogicTest::rootPerson); + static Functor rootPerson = functor(LogicTest::rootPerson); - static Term rootPerson(Root root, Person person) { + static Pred rootPerson(Root root, Person person) { return term(rootPerson, root, person); } @@ -104,9 +105,9 @@ static Person person(String name) { return term(strPerson, name); } - static Functor intPerson = functor((SerializableFunction) LogicTest::person); + static Functor intPerson = functor((SerializableFunction) LogicTest::person); - static Person person(IntLit i) { + static Person person(IntAtom i) { return term(intPerson, i); } @@ -118,15 +119,15 @@ static Person personVar(String name) { return var(Person.class, name); } - static Functor parentChild = functor(LogicTest::parentChild); + static Functor parentChild = functor(LogicTest::parentChild); - static Term parentChild(Person parent, Person child) { + static Pred parentChild(Person parent, Person child) { return term(parentChild, parent, child); } - static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); + static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); - static Term ancestorDescendent(Person ancestor, Person descendent) { + static Pred ancestorDescendent(Person ancestor, Person descendent) { return term(ancestorDescendent, ancestor, descendent); } @@ -134,8 +135,8 @@ static Term ancestorDescendent(Person ancestor, Person descendent) { Root U = rootVar("U"); - IntLit P = ilv("P"); - IntLit Q = ilv("Q"); + IntAtom P = ilv("P"); + IntAtom Q = ilv("Q"); Person A = personVar("A"); Person D = personVar("D"); From d48fad56b2c275e7e51644d4d4449defcb9de326 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 10:57:50 +0100 Subject: [PATCH 125/179] functions for family tree --- .../org/modelingvalue/dclare/Arithmetic.java | 15 +- .../java/org/modelingvalue/dclare/Logic.java | 37 ++++- .../modelingvalue/dclare/test/LogicTest.java | 157 +++++++++++++----- 3 files changed, 157 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index a830253f..5aa72fdf 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -29,23 +29,15 @@ public class Arithmetic extends Logic { - // Is - - private static Functor is = functor((SerializableBiFunction) Arithmetic::is); - - public static Pred is(Int i, IntAtom r) { - return term(is, i, r); - } - // Integer public static interface Int extends Term { } - public static interface IntAtom extends Int { + public static interface IntAtom extends Int, Atom { } - public static interface IntFunc extends Int { + public static interface IntFunc extends Int, Func { } private static Functor i = functor((SerializableFunction) Arithmetic::i); @@ -238,6 +230,8 @@ public static IntFunc sqrt(Int a) { // Is Rules public static void rules() { + Logic.isAtomRule(); + IntAtom PL = ilv("PL"); IntAtom QL = ilv("QL"); IntAtom RL = ilv("RL"); @@ -245,7 +239,6 @@ public static void rules() { Int X = iv("X"); Int Y = iv("Y"); - rule(is(PL, RL), goal(eq(PL, RL))); rule(is(plus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(PL, QL, RL))); rule(is(minus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(RL, QL, PL))); rule(is(multiply(X, Y), RL), goal(is(X, PL), is(Y, QL), multiply(PL, QL, RL))); diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 32015e42..0419fd54 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -484,6 +484,12 @@ public FunctImpl functor() { @SuppressWarnings("rawtypes") protected final void makeFact() { + if (functor().lambda() != null) { + throw new IllegalArgumentException("No facts of a functor with a lambda allowed. " + this); + } + if (RULES.get(functor()) != null) { + throw new IllegalArgumentException("No facts of a functor with rules allowed. " + this); + } FACTS.force(this, ADD_FACT, this); Object[] array = toArray(); for (int i = 1; i < array.length; i++) { @@ -1044,11 +1050,36 @@ public static Pred eq(Term a, Term b) { return term(eq, a, b); } - // Facts, Is + // Facts @SuppressWarnings({"unchecked", "rawtypes"}) - public static void fact(Term term) { - Logic. unproxy(term).makeFact(); + public static void fact(Pred pred) { + Logic. unproxy(pred).makeFact(); + } + + // Is + + public static interface Atom extends Term { + + } + + public static interface Func extends Term { + + } + + @SuppressWarnings("rawtypes") + private static Functor is = functor((SerializableBiFunction) Arithmetic::is); + + public static Pred is(T t, Atom a) { + return term(is, t, a); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + public static void isAtomRule() { + Atom A1 = var(Atom.class, "A1"); + Atom A2 = var(Atom.class, "A2"); + + rule(is(A1, A2), goal(eq(A1, A2))); } // Bindings diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 8cdf2ec2..a62ee7be 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -36,6 +36,8 @@ import org.modelingvalue.dclare.Arithmetic; import org.modelingvalue.dclare.Arithmetic.IntAtom; import org.modelingvalue.dclare.Logic; +import org.modelingvalue.dclare.Logic.Atom; +import org.modelingvalue.dclare.Logic.Func; import org.modelingvalue.dclare.Logic.Functor; import org.modelingvalue.dclare.Logic.Goal; import org.modelingvalue.dclare.Logic.Pred; @@ -90,77 +92,157 @@ static Root rootVar(String name) { static Functor rootPerson = functor(LogicTest::rootPerson); - static Pred rootPerson(Root root, Person person) { + static Pred rootPerson(Root root, PersonAtom person) { return term(rootPerson, root, person); } - // FamilyTree + // Family Tree interface Person extends Term { } - static Functor strPerson = functor((SerializableFunction) LogicTest::person); + interface PersonAtom extends Person, Atom { + } + + interface PersonFunc extends Person, Func { + } - static Person person(String name) { + static Functor strPerson = functor((SerializableFunction) LogicTest::person); + + static PersonAtom person(String name) { return term(strPerson, name); } - static Functor intPerson = functor((SerializableFunction) LogicTest::person); + static Functor intPerson = functor((SerializableFunction) LogicTest::person); - static Person person(IntAtom i) { + static PersonAtom person(IntAtom i) { return term(intPerson, i); } - static Person person(int i) { + static PersonAtom person(int i) { return person(i(i)); } + static PersonAtom personAtomVar(String name) { + return var(PersonAtom.class, name); + } + static Person personVar(String name) { return var(Person.class, name); } static Functor parentChild = functor(LogicTest::parentChild); - static Pred parentChild(Person parent, Person child) { + static Pred parentChild(PersonAtom parent, PersonAtom child) { return term(parentChild, parent, child); } + static Functor parent = functor(LogicTest::parent); + + static PersonFunc parent(Person child) { + return term(parent, child); + } + + static Functor child = functor(LogicTest::child); + + static PersonFunc child(Person parent) { + return term(child, parent); + } + static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); - static Pred ancestorDescendent(Person ancestor, Person descendent) { + static Pred ancestorDescendent(PersonAtom ancestor, PersonAtom descendent) { return term(ancestorDescendent, ancestor, descendent); } + static Functor ancestor = functor(LogicTest::ancestor); + + static PersonFunc ancestor(Person descendent) { + return term(ancestor, descendent); + } + + static Functor descendent = functor(LogicTest::descendent); + + static PersonFunc descendent(Person ancestor) { + return term(descendent, ancestor); + } + // Variables - Root U = rootVar("U"); + Root U = rootVar("U"); + + IntAtom P = ilv("P"); + IntAtom Q = ilv("Q"); - IntAtom P = ilv("P"); - IntAtom Q = ilv("Q"); + PersonAtom A = personAtomVar("A"); + PersonAtom B = personAtomVar("B"); + PersonAtom C = personAtomVar("C"); - Person A = personVar("A"); - Person D = personVar("D"); - Person R = personVar("R"); - Person B = personVar("B"); - Person C = personVar("C"); + Person X = personVar("X"); + Person Y = personVar("Y"); + Person Z = personVar("Z"); // Terms - Person Carel = person("Carel"); - Person Jan = person("Jan"); - Person Elske = person("Elske"); - Person Wim = person("Wim"); - Person Joppe = person("Joppe"); - Person Heleen = person("Heleen"); - Person Marijn = person("Marijn"); + PersonAtom Carel = person("Carel"); + PersonAtom Jan = person("Jan"); + PersonAtom Elske = person("Elske"); + PersonAtom Wim = person("Wim"); + PersonAtom Joppe = person("Joppe"); + PersonAtom Heleen = person("Heleen"); + PersonAtom Marijn = person("Marijn"); + + Root Root = root("Root"); + + // Family Rules - Root Root = root("Root"); + private void familyRules() { + Logic.isAtomRule(); + + rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); + rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); + + rule(is(ancestor(X), A), goal(is(X, B), ancestorDescendent(A, B))); + rule(is(descendent(X), A), goal(is(X, B), ancestorDescendent(B, A))); + + rule(ancestorDescendent(A, C), goal(parentChild(A, C))); + rule(ancestorDescendent(A, C), goal(ancestorDescendent(A, B), parentChild(B, C))); + } + + @RepeatedTest(100) + public void famTest0() { + run(() -> { + familyRules(); + + fact(parentChild(Carel, Jan)); + fact(parentChild(Jan, Wim)); + fact(parentChild(Elske, Wim)); + fact(parentChild(Wim, Joppe)); + fact(parentChild(Heleen, Joppe)); + fact(parentChild(Wim, Marijn)); + fact(parentChild(Heleen, Marijn)); + + isTrue(goal(is(parent(Joppe), Heleen))); + isTrue(goal(is(child(Jan), Wim))); + + isFalse(goal(is(parent(Wim), Marijn))); + isFalse(goal(is(parent(Wim), Heleen))); + isFalse(goal(is(child(Wim), Wim))); + + isTrue(goal(is(descendent(Wim), Marijn))); + isTrue(goal(is(descendent(Carel), Marijn))); + + isFalse(goal(is(descendent(Marijn), Wim))); + isFalse(goal(is(descendent(Heleen), Wim))); + isFalse(goal(is(descendent(Joppe), Carel))); + isFalse(goal(is(descendent(Carel), Carel))); + }); + } @RepeatedTest(100) public void famTest1() { run(() -> { - rule(ancestorDescendent(A, D), goal(parentChild(A, D))); - rule(ancestorDescendent(A, D), goal(ancestorDescendent(A, R), parentChild(R, D))); + familyRules(); fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); @@ -190,18 +272,17 @@ public void famTest1() { @RepeatedTest(100) public void famTest2() { run(() -> { - rule(ancestorDescendent(A, D), goal(parentChild(A, D))); - rule(ancestorDescendent(A, D), goal(ancestorDescendent(A, C), parentChild(C, D))); + familyRules(); - Person Carel = person("Carel"); - Person Jan = person("Jan"); - Person Wim = person("Wim"); + PersonAtom Carel = person("Carel"); + PersonAtom Jan = person("Jan"); + PersonAtom Wim = person("Wim"); fact(parentChild(Carel, Jan)); fact(parentChild(Jan, Wim)); hasBindings(goal(ancestorDescendent(A, Wim)), binding(A, Jan), binding(A, Carel)); - hasBindings(goal(ancestorDescendent(Carel, D)), binding(D, Jan), binding(D, Wim)); + hasBindings(goal(ancestorDescendent(Carel, C)), binding(C, Jan), binding(C, Wim)); }); } @@ -210,8 +291,8 @@ public void famTest3() { run(() -> { rule(parentChild(B, C), goal(parentChild(B, C))); - Person Jan = person("Jan"); - Person Wim = person("Wim"); + PersonAtom Jan = person("Jan"); + PersonAtom Wim = person("Wim"); hasBindings(goal(parentChild(Wim, Jan)), incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))); isIncomplete(goal(parentChild(Wim, Jan))); @@ -225,7 +306,7 @@ public void famTest4() { rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); rule(rootPerson(U, person(0)), goal()); - rule(rootPerson(U, D), goal(rootPerson(U, R), parentChild(R, D))); + rule(rootPerson(U, C), goal(rootPerson(U, A), parentChild(A, C))); isTrue(goal(parentChild(person(0), person(1)))); isTrue(goal(parentChild(person(3), person(4)))); @@ -237,8 +318,8 @@ public void famTest4() { isTrue(goal(rootPerson(Root, person(3)))); isTrue(goal(rootPerson(Root, person(4)))); - hasBindings(goal(rootPerson(Root, D)), binding(D, person(0)), binding(D, person(1)), // - binding(D, person(2)), binding(D, person(3)), binding(D, person(4))); + hasBindings(goal(rootPerson(Root, C)), binding(C, person(0)), binding(C, person(1)), // + binding(C, person(2)), binding(C, person(3)), binding(C, person(4))); }); } From 38d3d06adff28bbe8a80563f994c9e766fc9964e Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:02:52 +0100 Subject: [PATCH 126/179] Facts only allowed for Relations --- src/main/java/org/modelingvalue/dclare/Logic.java | 7 +++++-- .../org/modelingvalue/dclare/test/LogicTest.java | 12 +++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index 0419fd54..aa45c31d 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -415,6 +415,9 @@ public static interface Term { public static interface Pred extends Term { } + public static interface Rel extends Pred { + } + @SuppressWarnings("unchecked") public static F term(Functor functor, Object... args) { return new TermImpl(functor, args).proxy(); @@ -1053,8 +1056,8 @@ public static Pred eq(Term a, Term b) { // Facts @SuppressWarnings({"unchecked", "rawtypes"}) - public static void fact(Pred pred) { - Logic. unproxy(pred).makeFact(); + public static void fact(Rel rel) { + Logic. unproxy(rel).makeFact(); } // Is diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index a62ee7be..f4f17b68 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -36,13 +36,7 @@ import org.modelingvalue.dclare.Arithmetic; import org.modelingvalue.dclare.Arithmetic.IntAtom; import org.modelingvalue.dclare.Logic; -import org.modelingvalue.dclare.Logic.Atom; -import org.modelingvalue.dclare.Logic.Func; -import org.modelingvalue.dclare.Logic.Functor; -import org.modelingvalue.dclare.Logic.Goal; -import org.modelingvalue.dclare.Logic.Pred; -import org.modelingvalue.dclare.Logic.Term; -import org.modelingvalue.dclare.Logic.Variable; +import org.modelingvalue.dclare.Logic.*; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; @@ -131,9 +125,9 @@ static Person personVar(String name) { return var(Person.class, name); } - static Functor parentChild = functor(LogicTest::parentChild); + static Functor parentChild = functor(LogicTest::parentChild); - static Pred parentChild(PersonAtom parent, PersonAtom child) { + static Rel parentChild(PersonAtom parent, PersonAtom child) { return term(parentChild, parent, child); } From f95d1bac843bedb122d9d960172fc8e682370565 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:06:00 +0100 Subject: [PATCH 127/179] improved test --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index f4f17b68..5e4a2981 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -223,7 +223,7 @@ public void famTest0() { isFalse(goal(is(parent(Wim), Heleen))); isFalse(goal(is(child(Wim), Wim))); - isTrue(goal(is(descendent(Wim), Marijn))); + isTrue(goal(is(ancestor(Marijn), Wim))); isTrue(goal(is(descendent(Carel), Marijn))); isFalse(goal(is(descendent(Marijn), Wim))); From 6619cc0d3837a176167ce77a2d1196b5b4de28f0 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:34:38 +0100 Subject: [PATCH 128/179] root function --- .../modelingvalue/dclare/test/LogicTest.java | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 5e4a2981..048aff15 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -74,10 +74,20 @@ static void hasBindings(Goal goal, Map... bindings) { interface Root extends Term { } - static Functor root = functor(LogicTest::root); + interface RootAtom extends Root, Atom { + } + + interface RootFunc extends Root, Func { + } + + static Functor rootAtom = functor((SerializableFunction) LogicTest::root); - static Root root(String name) { - return term(root, name); + static RootAtom root(String name) { + return term(rootAtom, name); + } + + static RootAtom rootAtomVar(String name) { + return var(RootAtom.class, name); } static Root rootVar(String name) { @@ -86,10 +96,16 @@ static Root rootVar(String name) { static Functor rootPerson = functor(LogicTest::rootPerson); - static Pred rootPerson(Root root, PersonAtom person) { + static Pred rootPerson(RootAtom root, PersonAtom person) { return term(rootPerson, root, person); } + static Functor rootFunc = functor((SerializableFunction) LogicTest::root); + + static RootFunc root(Person person) { + return term(rootFunc, person); + } + // Family Tree interface Person extends Term { @@ -163,8 +179,6 @@ static PersonFunc descendent(Person ancestor) { // Variables - Root U = rootVar("U"); - IntAtom P = ilv("P"); IntAtom Q = ilv("Q"); @@ -186,7 +200,17 @@ static PersonFunc descendent(Person ancestor) { PersonAtom Heleen = person("Heleen"); PersonAtom Marijn = person("Marijn"); - Root Root = root("Root"); + RootAtom Root = root("Root"); + + RootAtom U = rootAtomVar("U"); + Root V = rootVar("V"); + + private void rootRules() { + rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); + rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); + + rule(is(root(X), U), goal(is(X, B), rootPerson(U, B))); + } // Family Rules @@ -297,22 +321,23 @@ public void famTest3() { public void famTest4() { run(() -> { Arithmetic.rules(); + rootRules(); rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); rule(rootPerson(U, person(0)), goal()); rule(rootPerson(U, C), goal(rootPerson(U, A), parentChild(A, C))); - isTrue(goal(parentChild(person(0), person(1)))); - isTrue(goal(parentChild(person(3), person(4)))); - isFalse(goal(parentChild(person(4), person(5)))); + isTrue(goal(is(child(person(0)), person(1)))); + isTrue(goal(is(child(person(3)), person(4)))); + isFalse(goal(is(child(person(4)), person(5)))); - isTrue(goal(rootPerson(Root, person(0)))); - isTrue(goal(rootPerson(Root, person(1)))); - isTrue(goal(rootPerson(Root, person(2)))); - isTrue(goal(rootPerson(Root, person(3)))); - isTrue(goal(rootPerson(Root, person(4)))); + isTrue(goal(is(root(person(0)), Root))); + isTrue(goal(is(root(person(1)), Root))); + isTrue(goal(is(root(person(4)), Root))); + isTrue(goal(is(root(person(3)), Root))); + isTrue(goal(is(root(person(2)), Root))); - hasBindings(goal(rootPerson(Root, C)), binding(C, person(0)), binding(C, person(1)), // + hasBindings(goal(is(root(C), Root)), binding(C, person(0)), binding(C, person(1)), // binding(C, person(2)), binding(C, person(3)), binding(C, person(4))); }); } From 771c1ed11aa724e0f6d28dad34963cbcd8a2e057 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:38:21 +0100 Subject: [PATCH 129/179] rule methods rename --- .../org/modelingvalue/dclare/Arithmetic.java | 4 ++-- .../modelingvalue/dclare/test/LogicTest.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index 5aa72fdf..ca516a3d 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -229,8 +229,8 @@ public static IntFunc sqrt(Int a) { // Is Rules - public static void rules() { - Logic.isAtomRule(); + public static void arithmeticRules() { + isAtomRule(); IntAtom PL = ilv("PL"); IntAtom QL = ilv("QL"); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 048aff15..0e51757c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -33,7 +33,6 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.dclare.Arithmetic; import org.modelingvalue.dclare.Arithmetic.IntAtom; import org.modelingvalue.dclare.Logic; import org.modelingvalue.dclare.Logic.*; @@ -206,16 +205,22 @@ static PersonFunc descendent(Person ancestor) { Root V = rootVar("V"); private void rootRules() { + arithmeticRules(); + rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); rule(is(root(X), U), goal(is(X, B), rootPerson(U, B))); + + rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); + rule(rootPerson(U, person(0)), goal()); + rule(rootPerson(U, C), goal(rootPerson(U, A), parentChild(A, C))); } // Family Rules private void familyRules() { - Logic.isAtomRule(); + isAtomRule(); rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); @@ -320,13 +325,8 @@ public void famTest3() { @RepeatedTest(100) public void famTest4() { run(() -> { - Arithmetic.rules(); rootRules(); - rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); - rule(rootPerson(U, person(0)), goal()); - rule(rootPerson(U, C), goal(rootPerson(U, A), parentChild(A, C))); - isTrue(goal(is(child(person(0)), person(1)))); isTrue(goal(is(child(person(3)), person(4)))); isFalse(goal(is(child(person(4)), person(5)))); @@ -345,7 +345,7 @@ public void famTest4() { @RepeatedTest(100) public void intTest() { run(() -> { - Arithmetic.rules(); + arithmeticRules(); hasBindings(goal(plus(i(7), i(3), P)), binding(P, i(10))); hasBindings(goal(plus(i(7), P, i(10))), binding(P, i(3))); @@ -356,7 +356,7 @@ public void intTest() { @RepeatedTest(100) public void isTest() { run(() -> { - Arithmetic.rules(); + arithmeticRules(); isTrue(goal(is(plus(i(11), i(22)), i(33)))); isTrue(goal(is(minus(i(33), i(22)), i(11)))); From f245d754f55455148248c9e576b9f08c33499b07 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:40:10 +0100 Subject: [PATCH 130/179] test cleanup --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 0e51757c..5926490d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -189,6 +189,9 @@ static PersonFunc descendent(Person ancestor) { Person Y = personVar("Y"); Person Z = personVar("Z"); + RootAtom U = rootAtomVar("U"); + Root V = rootVar("V"); + // Terms PersonAtom Carel = person("Carel"); @@ -201,8 +204,7 @@ static PersonFunc descendent(Person ancestor) { RootAtom Root = root("Root"); - RootAtom U = rootAtomVar("U"); - Root V = rootVar("V"); + // Root Rules private void rootRules() { arithmeticRules(); From a8cfd3866d2799c5f0e82c394015115fbe129205 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:45:00 +0100 Subject: [PATCH 131/179] literal -> atom --- .../org/modelingvalue/dclare/Arithmetic.java | 36 +++++++++---------- .../modelingvalue/dclare/test/LogicTest.java | 4 +-- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/Arithmetic.java index ca516a3d..0dba8b20 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/Arithmetic.java @@ -50,14 +50,10 @@ public static IntAtom i(long x) { return i(BigInteger.valueOf(x)); } - public static IntAtom ilv(String name) { + public static IntAtom iav(String name) { return var(IntAtom.class, name); } - public static IntFunc ifv(String name) { - return var(IntFunc.class, name); - } - public static Int iv(String name) { return var(Int.class, name); } @@ -232,25 +228,25 @@ public static IntFunc sqrt(Int a) { public static void arithmeticRules() { isAtomRule(); - IntAtom PL = ilv("PL"); - IntAtom QL = ilv("QL"); - IntAtom RL = ilv("RL"); + IntAtom P = iav("PL"); + IntAtom Q = iav("QL"); + IntAtom R = iav("RL"); Int X = iv("X"); Int Y = iv("Y"); - rule(is(plus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(PL, QL, RL))); - rule(is(minus(X, Y), RL), goal(is(X, PL), is(Y, QL), plus(RL, QL, PL))); - rule(is(multiply(X, Y), RL), goal(is(X, PL), is(Y, QL), multiply(PL, QL, RL))); - rule(is(divide(X, Y), RL), goal(is(X, PL), is(Y, QL), multiply(RL, QL, PL))); - rule(is(power(X), RL), goal(is(X, PL), power(PL, RL))); - rule(is(sqrt(X), RL), goal(is(X, PL), power(RL, PL))); - rule(gt(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(1)))); - rule(lt(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(-1)))); - rule(ge(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(1)))); - rule(ge(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(0)))); - rule(le(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(-1)))); - rule(le(X, Y), goal(is(X, PL), is(Y, QL), compare(PL, QL, i(0)))); + rule(is(plus(X, Y), R), goal(is(X, P), is(Y, Q), plus(P, Q, R))); + rule(is(minus(X, Y), R), goal(is(X, P), is(Y, Q), plus(R, Q, P))); + rule(is(multiply(X, Y), R), goal(is(X, P), is(Y, Q), multiply(P, Q, R))); + rule(is(divide(X, Y), R), goal(is(X, P), is(Y, Q), multiply(R, Q, P))); + rule(is(power(X), R), goal(is(X, P), power(P, R))); + rule(is(sqrt(X), R), goal(is(X, P), power(R, P))); + rule(gt(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(1)))); + rule(lt(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(-1)))); + rule(ge(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(1)))); + rule(ge(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(0)))); + rule(le(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(-1)))); + rule(le(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(0)))); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 5926490d..76a32146 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -178,8 +178,8 @@ static PersonFunc descendent(Person ancestor) { // Variables - IntAtom P = ilv("P"); - IntAtom Q = ilv("Q"); + IntAtom P = iav("P"); + IntAtom Q = iav("Q"); PersonAtom A = personAtomVar("A"); PersonAtom B = personAtomVar("B"); From 58b98bb37d9aa99cf936134b4c6a57567e6e7eb4 Mon Sep 17 00:00:00 2001 From: WimBast Date: Fri, 6 Dec 2024 11:52:17 +0100 Subject: [PATCH 132/179] unique rules --- src/main/java/org/modelingvalue/dclare/Logic.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/Logic.java index aa45c31d..2b7f5b4d 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/Logic.java @@ -56,7 +56,10 @@ public class Logic { } else { int p = e.rulePrio(); for (int i = 0; i < l.size(); i++) { - if (l.get(i).rulePrio() > p) { + RuleImpl r = l.get(i); + if (r.equals(e)) { + return l; + } else if (r.rulePrio() > p) { return l.insert(i, e); } } From e7228356ae023bd8787931a8b3b0a5095939283f Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 9 Dec 2024 09:45:41 +0100 Subject: [PATCH 133/179] collect and separate package --- .../dclare/{ => logic}/Arithmetic.java | 15 +- .../dclare/{ => logic}/Logic.java | 189 +++++++++++++++++- .../modelingvalue/dclare/test/LogicTest.java | 15 +- 3 files changed, 205 insertions(+), 14 deletions(-) rename src/main/java/org/modelingvalue/dclare/{ => logic}/Arithmetic.java (95%) rename src/main/java/org/modelingvalue/dclare/{ => logic}/Logic.java (84%) diff --git a/src/main/java/org/modelingvalue/dclare/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java similarity index 95% rename from src/main/java/org/modelingvalue/dclare/Arithmetic.java rename to src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java index 0dba8b20..3f9cd3b7 100644 --- a/src/main/java/org/modelingvalue/dclare/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java @@ -18,7 +18,9 @@ // but also our friend. "He will live on in many of the lines of code you see below." ~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -package org.modelingvalue.dclare; +package org.modelingvalue.dclare.logic; + +import static org.modelingvalue.dclare.logic.Logic.*; import java.math.BigInteger; @@ -26,8 +28,17 @@ import org.modelingvalue.collections.util.SerializableBiFunction; import org.modelingvalue.collections.util.SerializableFunction; import org.modelingvalue.collections.util.SerializableTriFunction; +import org.modelingvalue.dclare.logic.Logic.Atom; +import org.modelingvalue.dclare.logic.Logic.Func; +import org.modelingvalue.dclare.logic.Logic.Functor; +import org.modelingvalue.dclare.logic.Logic.Pred; +import org.modelingvalue.dclare.logic.Logic.Term; +import org.modelingvalue.dclare.logic.Logic.TermImpl; + +public final class Arithmetic { -public class Arithmetic extends Logic { + private Arithmetic() { + } // Integer diff --git a/src/main/java/org/modelingvalue/dclare/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java similarity index 84% rename from src/main/java/org/modelingvalue/dclare/Logic.java rename to src/main/java/org/modelingvalue/dclare/logic/Logic.java index 2b7f5b4d..d9291a61 100644 --- a/src/main/java/org/modelingvalue/dclare/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -18,13 +18,14 @@ // but also our friend. "He will live on in many of the lines of code you see below." ~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -package org.modelingvalue.dclare; +package org.modelingvalue.dclare.logic; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Objects; import java.util.function.BiFunction; +import java.util.function.Function; import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Entry; @@ -42,8 +43,13 @@ import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; +import org.modelingvalue.dclare.Constant; +import org.modelingvalue.dclare.CoreSetableModifier; -public class Logic { +public final class Logic { + + private Logic() { + } private static final boolean TRACE_LOGIC = Boolean.getBoolean("TRACE_LOGIC"); @@ -305,6 +311,11 @@ protected Class> type() { return (Class>) get(0); } + @SuppressWarnings({"unchecked", "rawtypes"}) + protected List args() { + return (List) get(3); + } + @SuppressWarnings({"unchecked", "rawtypes"}) protected SerializableFunction, Collection> lambda() { return (SerializableFunction, Collection>) get(4); @@ -365,6 +376,34 @@ private static TermImpl list(List es) { return l; } + // Prepend + + @SuppressWarnings("rawtypes") + private static final FunctImpl PREPEND_FUNCTOR = functImpl((SerializableTriFunction) Logic::prepend, t -> { + TermImpl e = t.getTerm(1); + TermImpl i = t.getTerm(2); + TermImpl o = t.getTerm(3); + if (e != null && i != null && o != null) { + return termImpl(LIST_FUNCTOR_2, e, i).equals(o) ? Set.of(t) : Set.of(); + } else if (e != null && i != null && o == null) { + return Set.of(t.set(3, termImpl(LIST_FUNCTOR_2, e, i))); + } else if (e != null && i == null && o != null) { + throw new UnsupportedOperationException("TODO"); + } else if (e == null && i != null && o != null) { + throw new UnsupportedOperationException("TODO"); + } else if (e == null && i == null && o != null) { + throw new UnsupportedOperationException("TODO"); + } else { + return t.incomplete(); + } + }); + @SuppressWarnings("rawtypes") + private static final Functor PREPEND_FUNCTOR_PROXY = PREPEND_FUNCTOR.proxy(); + + public static Pred prepend(E e, L i, L o) { + return term(PREPEND_FUNCTOR_PROXY, e, i, o); + } + // Variables public static interface Variable extends Term { @@ -523,12 +562,12 @@ protected Map getBinding(TermImpl term, Map if (get(0).equals(term.get(0))) { for (int i = 1; i < length(); i++) { Object tv = term.get(i); - Class tt = tv instanceof TermImpl ? ((TermImpl) tv).type() : tv instanceof Class ? (Class) tv : null; + Class tt = typeOf(tv); tv = tv instanceof Class ? null : tv; if (get(i) instanceof VarImpl) { VarImpl var = (VarImpl) get(i); Object vv = vars.get(var); - Class vt = vv instanceof TermImpl ? ((TermImpl) vv).type() : vv instanceof Class ? (Class) vv : null; + Class vt = typeOf(vv); vv = vv instanceof Class ? null : vv; if (vv != null) { if (tv != null && !tv.equals(vv)) { @@ -571,12 +610,20 @@ protected Map getBinding(TermImpl term, Map } } + @SuppressWarnings("rawtypes") + private static Class typeOf(Object v) { + return v instanceof ClauseImpl ? ((ClauseImpl) v).type() : v instanceof Class ? (Class) v : null; + } + @SuppressWarnings({"rawtypes", "unchecked"}) protected TermImpl setBinding(Map vars) { Object[] array = toArray(); for (int i = 1; i < length(); i++) { if (get(i) instanceof VarImpl) { - array[i] = vars.get((VarImpl) get(i)); + Object v = vars.get((VarImpl) get(i)); + if (v != null) { + array[i] = v; + } } else if (get(i) instanceof TermImpl) { array[i] = ((TermImpl) get(i)).setBinding(vars); } @@ -802,6 +849,134 @@ protected boolean isIncomplete() { } }; + // CollectTerm + + public static interface Collect extends Pred { + } + + private static final FunctImpl COLLECT_FUNCTOR = functImpl((SerializableBiFunction) Logic::collect, null); + private static final Functor COLLECT_FUNCTOR_PROXY = COLLECT_FUNCTOR.proxy(); + + @SuppressWarnings("unchecked") + public static Collect collect(Pred pred, Pred accum) { + return new CollectImpl(pred, accum).proxy(); + } + + @SuppressWarnings("rawtypes") + protected static CollectImpl collectImpl(TermImpl pred, TermImpl accum) { + return new CollectImpl(pred, accum); + } + + private static final class CollectImpl extends TermImpl { + private static final long serialVersionUID = -2799691054715131197L; + + private CollectImpl(Pred pred, Pred accum) { + super(COLLECT_FUNCTOR_PROXY, pred, accum); + } + + @SuppressWarnings("rawtypes") + private CollectImpl(TermImpl pred, TermImpl accum) { + super(COLLECT_FUNCTOR, pred, accum); + } + + private CollectImpl(Object[] args) { + super(args); + } + + @Override + @SuppressWarnings("unchecked") + protected Collect proxy() { + return (Collect) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Collect.class}, this); + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + protected CollectImpl term(Object[] array) { + return new CollectImpl(array); + } + + @SuppressWarnings("rawtypes") + protected final TermImpl pred() { + return ((TermImpl) get(1)); + } + + @SuppressWarnings("rawtypes") + protected final TermImpl accum() { + return ((TermImpl) get(2)); + } + + @SuppressWarnings("rawtypes") + protected Map localVariables() { + Map predVars = pred().variables(); + Map accumVars = accum().variables(); + return predVars.filter(accumVars::contains).asMap(Function.identity()); + } + + @SuppressWarnings("rawtypes") + @Override + protected Map variables() { + Map predVars = pred().variables(); + Map accumVars = accum().variables(); + return Collection.concat(predVars.exclude(accumVars::contains), accumVars.exclude(predVars::contains)).asMap(Function.identity()); + } + + @SuppressWarnings("rawtypes") + private static int identityIndex(TermImpl accum) { + for (int i = 1; i < accum.length(); i++) { + if (accum.get(i) instanceof TermImpl) { + return i; + } + } + return -1; + } + + @SuppressWarnings("rawtypes") + private static int resultIndex(TermImpl accum) { + for (int i = 1; i < accum.length(); i++) { + if (accum.get(i) instanceof Class) { + return i; + } + } + return -1; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + protected Collection match(TermImpl goal, List der, Map> rec) { + Map localVars = localVariables(); + TermImpl goalPred = ((CollectImpl) goal).pred(); + TermImpl pred = pred().setBinding(localVars); + TermImpl goalAccum = ((CollectImpl) goal).accum(); + TermImpl accum = accum(); + int ii = identityIndex(accum); + int ri = resultIndex(accum); + Set rs = Set.of(accum.getTerm(ii)); + for (TermImpl m : ((TermImpl) pred).match(goalPred, der, rec)) { + Map b = goalPred.getBinding(m, Map.of()); + Set a = Set.of(); + for (TermImpl r : rs) { + TermImpl s = accum.setBinding(b).set(ii, r); + a = a.addAll(s.match(goalAccum, der, rec)); + } + rs = a.map(t -> t.getTerm(ri)).asSet(); + } + return rs.map(t -> set(2, accum.set(ri, t))); + } + + @SuppressWarnings("rawtypes") + @Override + protected int termPrio(TermImpl goal, List der, Map> rec) { + return super.termPrio(goal, der, rec); + } + + @SuppressWarnings("rawtypes") + @Override + protected Map getBinding(TermImpl term, Map vars) { + Map localVars = localVariables(); + return super.getBinding(term, vars).exclude(e -> localVars.containsKey(e.getKey())).asMap(Function.identity()); + } + } + // Rules public static interface Rule extends Term { @@ -1038,7 +1213,7 @@ public static Incomplete incomplete(L der) { // Equals @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor eq = functor(Arithmetic::eq, t -> { + private static Functor eq = functor(Logic::eq, t -> { TermImpl at = t.getTerm(1); TermImpl bt = t.getTerm(2); if (at == null && bt == null) { @@ -1074,7 +1249,7 @@ public static interface Func extends Term { } @SuppressWarnings("rawtypes") - private static Functor is = functor((SerializableBiFunction) Arithmetic::is); + private static Functor is = functor((SerializableBiFunction) Logic::is); public static Pred is(T t, Atom a) { return term(is, t, a); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 76a32146..770c8afb 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -22,8 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.modelingvalue.dclare.Arithmetic.*; -import static org.modelingvalue.dclare.Logic.*; +import static org.modelingvalue.dclare.logic.Arithmetic.*; +import static org.modelingvalue.dclare.logic.Logic.*; import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; import java.util.concurrent.ThreadLocalRandom; @@ -33,11 +33,11 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.dclare.Arithmetic.IntAtom; -import org.modelingvalue.dclare.Logic; -import org.modelingvalue.dclare.Logic.*; import org.modelingvalue.dclare.Universe; import org.modelingvalue.dclare.UniverseTransaction; +import org.modelingvalue.dclare.logic.Arithmetic.IntAtom; +import org.modelingvalue.dclare.logic.Logic; +import org.modelingvalue.dclare.logic.Logic.*; public class LogicTest { @@ -192,6 +192,9 @@ static PersonFunc descendent(Person ancestor) { RootAtom U = rootAtomVar("U"); Root V = rootVar("V"); + @SuppressWarnings("unchecked") + L PL = var(L.class, "PL"); + // Terms PersonAtom Carel = person("Carel"); @@ -291,6 +294,8 @@ public void famTest1() { isFalse(goal(ancestorDescendent(Heleen, Wim))); isFalse(goal(ancestorDescendent(Joppe, Carel))); isFalse(goal(ancestorDescendent(Carel, Carel))); + + hasBindings(goal(collect(parentChild(Wim, C), prepend(C, l(), PL))), binding(PL, l(Marijn, Joppe))); }); } From f28f788cb421a67b59cdb8282ab2fdac3ac52f00 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 9 Dec 2024 11:33:39 +0100 Subject: [PATCH 134/179] more add functionality on L --- .../org/modelingvalue/dclare/logic/Logic.java | 173 +++++++++++++----- .../modelingvalue/dclare/test/LogicTest.java | 2 +- 2 files changed, 124 insertions(+), 51 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index d9291a61..630ec370 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -43,6 +43,7 @@ import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; +import org.modelingvalue.collections.util.StringUtil; import org.modelingvalue.dclare.Constant; import org.modelingvalue.dclare.CoreSetableModifier; @@ -78,7 +79,7 @@ private Logic() { @SuppressWarnings("rawtypes") private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); - private static abstract class ClauseImpl extends StructImpl implements InvocationHandler { + private static abstract class ClauseImpl extends StructImpl implements InvocationHandler, Comparable> { private static final long serialVersionUID = 7315776001191198132L; private static final Method EQUALS; @@ -156,6 +157,33 @@ private static final Object[] unproxy(Functor functor, Object[] args) { protected abstract Class type(); protected abstract ClauseImpl term(Object[] array); + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public int compareTo(ClauseImpl o) { + int r = length() - o.length(); + if (r != 0) { + return r; + } + for (int i = 0; i < length(); i++) { + Object tv = get(i); + Object ov = o.get(i); + if (tv instanceof Comparable && tv.getClass().equals(ov.getClass())) { + r = ((Comparable) tv).compareTo(ov); + if (r != 0) { + break; + } + } else { + String ts = StringUtil.toString(tv); + String os = StringUtil.toString(ov); + r = ts.compareTo(os); + if (r != 0) { + break; + } + } + } + return r; + } } private static final Object noProxy(Object object) { @@ -378,30 +406,52 @@ private static TermImpl list(List es) { // Prepend + @SuppressWarnings({"unchecked", "rawtypes"}) + private static List addOrdered(List l, TermImpl e) { + for (int i = 0; i < l.size(); i++) { + if (l.get(i).compareTo(e) > 0) { + return l.insert(i, e); + } + } + return l.append(e); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + private static Set> remove(List l, TermImpl e) { + Set> ls = Set.of(); + for (int i = l.firstIndexOf(e); i >= 0; i = l.firstIndexOf(i, l.size(), e)) { + ls = ls.add(l.removeIndex(i)); + } + return ls; + } + @SuppressWarnings("rawtypes") - private static final FunctImpl PREPEND_FUNCTOR = functImpl((SerializableTriFunction) Logic::prepend, t -> { - TermImpl e = t.getTerm(1); - TermImpl i = t.getTerm(2); - TermImpl o = t.getTerm(3); - if (e != null && i != null && o != null) { - return termImpl(LIST_FUNCTOR_2, e, i).equals(o) ? Set.of(t) : Set.of(); - } else if (e != null && i != null && o == null) { - return Set.of(t.set(3, termImpl(LIST_FUNCTOR_2, e, i))); - } else if (e != null && i == null && o != null) { - throw new UnsupportedOperationException("TODO"); - } else if (e == null && i != null && o != null) { - throw new UnsupportedOperationException("TODO"); - } else if (e == null && i == null && o != null) { - throw new UnsupportedOperationException("TODO"); - } else { - return t.incomplete(); + private static final FunctImpl ADD_FUNCTOR = functImpl((SerializableTriFunction) Logic::add, t -> { + TermImpl e = t.getTerm(1); + TermImpl i = t.getTerm(2); + TermImpl o = t.getTerm(3); + List il = i != null ? i.list() : null; + List ol = o != null ? o.list() : null; + if (e != null && il != null && ol != null) { + return addOrdered(il, e).equals(ol) ? Set.of(t) : Set.of(); + } else if (e != null && il != null && ol == null) { + return Set.of(t.set(3, list(addOrdered(il, e)))); + } else if (e != null && il == null && ol != null) { + return remove(ol, e).map(r -> (TermImpl) t.set(2, r)).asSet(); + } else if (e == null && il != null && ol != null) { + if (il.anyMatch(ol::notContains)) { + return Set.of(); } - }); + return ol.removeAll(il).map(r -> (TermImpl) t.set(1, r)).asSet(); + } else { + return t.incomplete(); + } + }); @SuppressWarnings("rawtypes") - private static final Functor PREPEND_FUNCTOR_PROXY = PREPEND_FUNCTOR.proxy(); + private static final Functor ADD_FUNCTOR_PROXY = ADD_FUNCTOR.proxy(); - public static Pred prepend(E e, L i, L o) { - return term(PREPEND_FUNCTOR_PROXY, e, i, o); + public static Pred add(E e, L i, L o) { + return term(ADD_FUNCTOR_PROXY, e, i, o); } // Variables @@ -662,14 +712,14 @@ public Set incomplete() { @SuppressWarnings({"rawtypes", "unchecked"}) protected Collection match(TermImpl goal, List der, Map> rec) { - int non = nrOfNulls(); - if (non > 1 || non >= totalLength()) { - return Set.of(Logic.incomplete(der.append(this))); - } SerializableFunction, Collection> lambda = functor().lambda(); if (lambda != null) { return lambda.apply(this); } + int non = nrOfNulls(); + if (non > 1 || non >= totalLength()) { + return Set.of(Logic.incomplete(der.append(this))); + } Set facts = FACTS.get(this); if (facts != null) { return facts; @@ -708,9 +758,6 @@ protected Collection match(TermImpl goal, List der, Map der, Map> rec) { int non = nrOfNulls(); - if (non > 1 || non >= totalLength()) { - return Integer.MAX_VALUE; - } SerializableFunction, Collection> lambda = functor().lambda(); if (lambda != null) { Collection result = lambda.apply(this); @@ -718,7 +765,10 @@ protected int termPrio(TermImpl goal, List der, Map set = (Set) result; return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); } - return non; + return non - nrOfBindings(goal); + } + if (non > 1 || non >= totalLength()) { + return Integer.MAX_VALUE; } Set facts = FACTS.get(this); if (facts != null) { @@ -905,53 +955,76 @@ protected final TermImpl accum() { return ((TermImpl) get(2)); } + @SuppressWarnings("rawtypes") + private Map localVariables; + @SuppressWarnings("rawtypes") protected Map localVariables() { - Map predVars = pred().variables(); - Map accumVars = accum().variables(); - return predVars.filter(accumVars::contains).asMap(Function.identity()); + if (localVariables == null) { + Map predVars = pred().variables(); + Map accumVars = accum().variables(); + localVariables = predVars.filter(accumVars::contains).asMap(Function.identity()); + } + return localVariables; } + @SuppressWarnings("rawtypes") + private Map variables; + @SuppressWarnings("rawtypes") @Override protected Map variables() { - Map predVars = pred().variables(); - Map accumVars = accum().variables(); - return Collection.concat(predVars.exclude(accumVars::contains), accumVars.exclude(predVars::contains)).asMap(Function.identity()); + if (variables == null) { + Map predVars = pred().variables(); + Map accumVars = accum().variables(); + variables = Collection.concat(predVars.exclude(accumVars::contains), accumVars.exclude(predVars::contains)).asMap(Function.identity()); + } + return variables; } + private int identityIndex = -1; + @SuppressWarnings("rawtypes") - private static int identityIndex(TermImpl accum) { - for (int i = 1; i < accum.length(); i++) { - if (accum.get(i) instanceof TermImpl) { - return i; + private int identityIndex() { + if (identityIndex < 0) { + TermImpl accum = accum(); + for (int i = 1; i < accum.length(); i++) { + if (accum.get(i) instanceof TermImpl) { + identityIndex = i; + break; + } } } - return -1; + return identityIndex; } + private int resultIndex = -1; + @SuppressWarnings("rawtypes") - private static int resultIndex(TermImpl accum) { - for (int i = 1; i < accum.length(); i++) { - if (accum.get(i) instanceof Class) { - return i; + private int resultIndex() { + if (resultIndex < 0) { + TermImpl accum = accum(); + for (int i = 1; i < accum.length(); i++) { + if (accum.get(i) instanceof VarImpl && !localVariables().containsKey((VarImpl) accum.get(i))) { + resultIndex = i; + break; + } } } - return -1; + return resultIndex; } @SuppressWarnings({"rawtypes", "unchecked"}) @Override protected Collection match(TermImpl goal, List der, Map> rec) { - Map localVars = localVariables(); + Map localVars = ((CollectImpl) goal).localVariables(); + int ii = ((CollectImpl) goal).identityIndex(); + int ri = ((CollectImpl) goal).resultIndex(); TermImpl goalPred = ((CollectImpl) goal).pred(); - TermImpl pred = pred().setBinding(localVars); TermImpl goalAccum = ((CollectImpl) goal).accum(); TermImpl accum = accum(); - int ii = identityIndex(accum); - int ri = resultIndex(accum); Set rs = Set.of(accum.getTerm(ii)); - for (TermImpl m : ((TermImpl) pred).match(goalPred, der, rec)) { + for (TermImpl m : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec)) { Map b = goalPred.getBinding(m, Map.of()); Set a = Set.of(); for (TermImpl r : rs) { diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 770c8afb..8b350933 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -295,7 +295,7 @@ public void famTest1() { isFalse(goal(ancestorDescendent(Joppe, Carel))); isFalse(goal(ancestorDescendent(Carel, Carel))); - hasBindings(goal(collect(parentChild(Wim, C), prepend(C, l(), PL))), binding(PL, l(Marijn, Joppe))); + hasBindings(goal(collect(parentChild(Wim, C), add(C, l(), PL))), binding(PL, l(Joppe, Marijn))); }); } From 87026291d09cfcfc069817abeafb3cae9a425a07 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 9 Dec 2024 13:29:49 +0100 Subject: [PATCH 135/179] incomplete handing in collect --- .../org/modelingvalue/dclare/logic/Logic.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 630ec370..0907d7ee 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -707,7 +707,7 @@ public TermImpl set(int i, Object v) { @SuppressWarnings({"rawtypes", "unchecked"}) public Set incomplete() { - return Set.of(Logic.incomplete(Logic.list(this))); + return Set.of(Logic.incomplete(List.of(this))); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -732,7 +732,7 @@ protected Collection match(TermImpl goal, List der, Map= 0) { - return Set.of(Logic.incomplete(der.sublist(i, der.size()).append(this))); + return Set.of(Logic.incomplete(der.append(this))); } der = der.append(this); Set set = Set.of(), add = Set.of(); @@ -1024,16 +1024,27 @@ protected Collection match(TermImpl goal, List der, Map rs = Set.of(accum.getTerm(ii)); - for (TermImpl m : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec)) { - Map b = goalPred.getBinding(m, Map.of()); - Set a = Set.of(); - for (TermImpl r : rs) { - TermImpl s = accum.setBinding(b).set(ii, r); - a = a.addAll(s.match(goalAccum, der, rec)); + Set inc = Set.of(); + for (TermImpl pm : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec)) { + if (pm.isIncomplete()) { + inc = inc.add(pm); + } else { + Map b = goalPred.getBinding(pm, Map.of()); + Set a = Set.of(); + for (TermImpl r : rs) { + TermImpl s = accum.setBinding(b).set(ii, r); + for (TermImpl am : ((TermImpl) s).match(goalAccum, der, rec)) { + if (am.isIncomplete()) { + inc = inc.add(am); + } else { + a = a.add(am); + } + } + } + rs = a.map(t -> t.getTerm(ri)).asSet(); } - rs = a.map(t -> t.getTerm(ri)).asSet(); } - return rs.map(t -> set(2, accum.set(ri, t))); + return Collection.concat(inc, rs.map(t -> set(2, accum.set(ri, t)))); } @SuppressWarnings("rawtypes") From ae1586a86284d0fa4c6c591f9a7bed0a7adef0fe Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 9 Dec 2024 15:40:28 +0100 Subject: [PATCH 136/179] sum --- src/test/java/org/modelingvalue/dclare/test/LogicTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 8b350933..6697914c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -381,6 +381,8 @@ public void isTest() { hasBindings(goal(is(plus(P, i(3)), i(10))), binding(P, i(7))); hasBindings(goal(is(sqrt(i(49)), P)), binding(P, i(7)), binding(P, i(-7))); + + hasBindings(goal(collect(is(sqrt(i(49)), P), plus(P, i(0), Q))), binding(Q, i(0))); }); } From 5c026fb9c41476dc1b4a2317d2318568853180c0 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 07:09:16 +0100 Subject: [PATCH 137/179] symmetric is --- src/main/java/org/modelingvalue/dclare/logic/Logic.java | 8 ++++++-- .../java/org/modelingvalue/dclare/test/LogicTest.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 0907d7ee..9a15ac18 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -1335,16 +1335,20 @@ public static interface Func extends Term { @SuppressWarnings("rawtypes") private static Functor is = functor((SerializableBiFunction) Logic::is); - public static Pred is(T t, Atom a) { - return term(is, t, a); + public static Pred is(T a, T b) { + return term(is, a, b); } @SuppressWarnings({"rawtypes", "unchecked"}) public static void isAtomRule() { Atom A1 = var(Atom.class, "A1"); Atom A2 = var(Atom.class, "A2"); + Func F1 = var(Func.class, "F1"); + Func F2 = var(Func.class, "F2"); rule(is(A1, A2), goal(eq(A1, A2))); + rule(is(F1, F2), goal(is(F2, A2), is(F1, A2))); + rule(is(A1, F1), goal(is(F1, A1))); } // Bindings diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 6697914c..f945822e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -251,9 +251,9 @@ public void famTest0() { fact(parentChild(Heleen, Marijn)); isTrue(goal(is(parent(Joppe), Heleen))); - isTrue(goal(is(child(Jan), Wim))); + isTrue(goal(is(Wim, child(Jan)))); - isFalse(goal(is(parent(Wim), Marijn))); + isFalse(goal(is(Marijn, parent(Wim)))); isFalse(goal(is(parent(Wim), Heleen))); isFalse(goal(is(child(Wim), Wim))); From 64d9906b4f428df2c02ae2101cc0e82f29b339ea Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 07:47:32 +0100 Subject: [PATCH 138/179] deep eq --- .../dclare/logic/Arithmetic.java | 2 +- .../org/modelingvalue/dclare/logic/Logic.java | 57 ++++++++++++++++++- .../modelingvalue/dclare/test/LogicTest.java | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java b/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java index 3f9cd3b7..f72cac4b 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java @@ -237,7 +237,7 @@ public static IntFunc sqrt(Int a) { // Is Rules public static void arithmeticRules() { - isAtomRule(); + isRules(); IntAtom P = iav("PL"); IntAtom Q = iav("QL"); diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 9a15ac18..4e0c652a 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -184,6 +184,52 @@ public int compareTo(ClauseImpl o) { } return r; } + + @SuppressWarnings({"rawtypes", "unchecked"}) + protected ClauseImpl eq(ClauseImpl other) { + Object[] array = toArray(); + for (int i = 0; i < array.length; i++) { + Object tv = get(i); + Object ov = other.get(i); + if (tv != ov) { + if (tv instanceof ClauseImpl && ov instanceof ClauseImpl) { + ClauseImpl eq = ((ClauseImpl) tv).eq((ClauseImpl) ov); + if (eq != null) { + array[i] = eq; + } else { + return null; + } + } else if (tv instanceof ClauseImpl && ov instanceof Class) { + if (((Class) ov).isAssignableFrom(((ClauseImpl) tv).type())) { + array[i] = tv; + } else { + return null; + } + } else if (tv instanceof Class && ov instanceof ClauseImpl) { + if (((Class) tv).isAssignableFrom(((ClauseImpl) ov).type())) { + array[i] = ov; + } else { + return null; + } + } else if (!(tv instanceof Class) && ov instanceof Class) { + if (((Class) ov).isAssignableFrom(tv.getClass())) { + array[i] = tv; + } else { + return null; + } + } else if (tv instanceof Class && !(ov instanceof Class)) { + if (((Class) tv).isAssignableFrom(ov.getClass())) { + array[i] = ov; + } else { + return null; + } + } else if (!Objects.equals(tv, ov)) { + return null; + } + } + } + return term(array); + } } private static final Object noProxy(Object object) { @@ -897,6 +943,12 @@ protected boolean isIncomplete(TermImpl other) { protected boolean isIncomplete() { return functor() == INCOMPLETE_FUNCTOR; } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + protected TermImpl eq(ClauseImpl other) { + return (TermImpl) super.eq(other); + } }; // CollectTerm @@ -1307,7 +1359,8 @@ public static Incomplete incomplete(L der) { } else if (bt == null) { return Set.of(t.set(2, at)); } else { - return at.equals(bt) ? Set.of(t) : Set.of(); + TermImpl eq = at.eq(bt); + return eq == null ? Set.of() : Set.of(t.set(1, eq).set(2, eq)); } }); @@ -1340,7 +1393,7 @@ public static Pred is(T a, T b) { } @SuppressWarnings({"rawtypes", "unchecked"}) - public static void isAtomRule() { + public static void isRules() { Atom A1 = var(Atom.class, "A1"); Atom A2 = var(Atom.class, "A2"); Func F1 = var(Func.class, "F1"); diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index f945822e..08486ad1 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -225,7 +225,7 @@ private void rootRules() { // Family Rules private void familyRules() { - isAtomRule(); + isRules(); rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); From c8dfb162777c053f8291d34742b7316b6e2c8a8e Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 07:50:18 +0100 Subject: [PATCH 139/179] eq using == --- src/main/java/org/modelingvalue/dclare/logic/Logic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 4e0c652a..6e3b9d00 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -187,6 +187,9 @@ public int compareTo(ClauseImpl o) { @SuppressWarnings({"rawtypes", "unchecked"}) protected ClauseImpl eq(ClauseImpl other) { + if (this == other) { + return this; + } Object[] array = toArray(); for (int i = 0; i < array.length; i++) { Object tv = get(i); From 9c98d1921ef01f538abe4317f204e3bfcd07e26a Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 08:05:24 +0100 Subject: [PATCH 140/179] more precise identity index resolvement --- src/main/java/org/modelingvalue/dclare/logic/Logic.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 6e3b9d00..53fe5d0a 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -1045,8 +1045,12 @@ private int identityIndex() { TermImpl accum = accum(); for (int i = 1; i < accum.length(); i++) { if (accum.get(i) instanceof TermImpl) { - identityIndex = i; - break; + Class rt = ((VarImpl) accum.get(resultIndex())).type(); + Class at = ((TermImpl) accum.get(i)).type(); + if (rt.isAssignableFrom(at)) { + identityIndex = i; + break; + } } } } From 9d6c3fa59c6ab16885d3349177e7291e2691a438 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 08:15:36 +0100 Subject: [PATCH 141/179] simplified collect --- .../org/modelingvalue/dclare/logic/Logic.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 53fe5d0a..30e8f9f9 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -453,7 +453,7 @@ private static TermImpl list(List es) { return l; } - // Prepend + // Add @SuppressWarnings({"unchecked", "rawtypes"}) private static List addOrdered(List l, TermImpl e) { @@ -954,16 +954,13 @@ protected TermImpl eq(ClauseImpl other) { } }; - // CollectTerm + // Collect - public static interface Collect extends Pred { - } - - private static final FunctImpl COLLECT_FUNCTOR = functImpl((SerializableBiFunction) Logic::collect, null); - private static final Functor COLLECT_FUNCTOR_PROXY = COLLECT_FUNCTOR.proxy(); + private static final FunctImpl COLLECT_FUNCTOR = functImpl((SerializableBiFunction) Logic::collect, null); + private static final Functor COLLECT_FUNCTOR_PROXY = COLLECT_FUNCTOR.proxy(); @SuppressWarnings("unchecked") - public static Collect collect(Pred pred, Pred accum) { + public static Pred collect(Pred pred, Pred accum) { return new CollectImpl(pred, accum).proxy(); } @@ -972,7 +969,7 @@ protected static CollectImpl collectImpl(TermImpl pred, TermImpl accum) { return new CollectImpl(pred, accum); } - private static final class CollectImpl extends TermImpl { + private static final class CollectImpl extends TermImpl { private static final long serialVersionUID = -2799691054715131197L; private CollectImpl(Pred pred, Pred accum) { @@ -990,8 +987,8 @@ private CollectImpl(Object[] args) { @Override @SuppressWarnings("unchecked") - protected Collect proxy() { - return (Collect) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Collect.class}, this); + protected Pred proxy() { + return (Pred) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Pred.class}, this); } @Override @@ -1114,7 +1111,7 @@ protected int termPrio(TermImpl goal, List der, Map getBinding(TermImpl term, Map vars) { + protected Map getBinding(TermImpl term, Map vars) { Map localVars = localVariables(); return super.getBinding(term, vars).exclude(e -> localVars.containsKey(e.getKey())).asMap(Function.identity()); } From ee8c035c6bd1be748d769bec48733c53733bc787 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 09:12:58 +0100 Subject: [PATCH 142/179] make Logic independent of DClare --- .../org/modelingvalue/dclare/logic/Logic.java | 99 +++++++++++-------- .../modelingvalue/dclare/test/LogicTest.java | 12 +-- 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/dclare/logic/Logic.java index 30e8f9f9..ec85cae2 100644 --- a/src/main/java/org/modelingvalue/dclare/logic/Logic.java +++ b/src/main/java/org/modelingvalue/dclare/logic/Logic.java @@ -24,6 +24,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; import java.util.function.Function; @@ -33,6 +34,7 @@ import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.struct.impl.StructImpl; +import org.modelingvalue.collections.util.Context; import org.modelingvalue.collections.util.SerializableBiFunction; import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; import org.modelingvalue.collections.util.SerializableFunction; @@ -44,14 +46,24 @@ import org.modelingvalue.collections.util.SerializableTriFunction; import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; import org.modelingvalue.collections.util.StringUtil; -import org.modelingvalue.dclare.Constant; -import org.modelingvalue.dclare.CoreSetableModifier; public final class Logic { private Logic() { } + private static final Context DATABASE = Context.of(); + + public static final void run(Runnable runnable) { + DATABASE.run(new Database(), runnable); + } + + @SuppressWarnings("rawtypes") + private static final class Database { + private final AtomicReference>> facts = new AtomicReference<>(Map.of()); + private final AtomicReference>> rules = new AtomicReference<>(Map.of()); + } + private static final boolean TRACE_LOGIC = Boolean.getBoolean("TRACE_LOGIC"); @SuppressWarnings("rawtypes") @@ -73,11 +85,6 @@ private Logic() { return l.append(e); } }; - @SuppressWarnings("rawtypes") - private static final Constant> FACTS = Constant.of("FACTS", null, CoreSetableModifier.durable); - - @SuppressWarnings("rawtypes") - private static final Constant> RULES = Constant.of("RULES", null, CoreSetableModifier.durable); private static abstract class ClauseImpl extends StructImpl implements InvocationHandler, Comparable> { private static final long serialVersionUID = 7315776001191198132L; @@ -627,18 +634,19 @@ public FunctImpl functor() { } @SuppressWarnings("rawtypes") - protected final void makeFact() { + protected final void makeFact(Database database) { if (functor().lambda() != null) { throw new IllegalArgumentException("No facts of a functor with a lambda allowed. " + this); } - if (RULES.get(functor()) != null) { + if (database.rules.get().get(functor()) != null) { throw new IllegalArgumentException("No facts of a functor with rules allowed. " + this); } - FACTS.force(this, ADD_FACT, this); + database.facts.updateAndGet(m -> m.put(this, ADD_FACT.apply(m.get(this), this))); Object[] array = toArray(); for (int i = 1; i < array.length; i++) { array[i] = getType(i); - FACTS.force(term(array), ADD_FACT, this); + TermImpl term = term(array); + database.facts.updateAndGet(m -> m.put(term, ADD_FACT.apply(m.get(term), this))); array = toArray(); } } @@ -760,7 +768,7 @@ public Set incomplete() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match(TermImpl goal, List der, Map> rec) { + protected Collection match(TermImpl goal, List der, Map> rec, Database database) { SerializableFunction, Collection> lambda = functor().lambda(); if (lambda != null) { return lambda.apply(this); @@ -769,11 +777,11 @@ protected Collection match(TermImpl goal, List der, Map 1 || non >= totalLength()) { return Set.of(Logic.incomplete(der.append(this))); } - Set facts = FACTS.get(this); + Set facts = database.facts.get().get(this); if (facts != null) { return facts; } - List rules = RULES.get(functor()); + List rules = database.rules.get().get(functor()); if (rules != null) { Set r = rec.get(this); if (r != null) { @@ -787,7 +795,7 @@ protected Collection match(TermImpl goal, List der, Map set = Set.of(), add = Set.of(); boolean found = false, incomplete = false; do { - add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add)).removeAll(set); + add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add), database).removeAll(set); found = add.anyMatch(this::equalFunctor); incomplete |= add.anyMatch(this::isIncomplete); if (incomplete && found && set.isEmpty()) { @@ -795,17 +803,22 @@ protected Collection match(TermImpl goal, List der, Map der, Map> rec) { + private void memoization(Set set, Database database) { + database.facts.updateAndGet(m -> m.put(this, set)); + for (TermImpl e : set) { + database.facts.updateAndGet(m -> m.put(e, Set.of(e))); + } + } + + @SuppressWarnings("rawtypes") + protected int termPrio(TermImpl goal, List der, Map> rec, Database database) { int non = nrOfNulls(); SerializableFunction, Collection> lambda = functor().lambda(); if (lambda != null) { @@ -819,11 +832,11 @@ protected int termPrio(TermImpl goal, List der, Map 1 || non >= totalLength()) { return Integer.MAX_VALUE; } - Set facts = FACTS.get(this); + Set facts = database.facts.get().get(this); if (facts != null) { return Integer.MIN_VALUE + facts.size(); } - List rules = RULES.get(functor()); + List rules = database.rules.get().get(functor()); if (rules != null) { Set r = rec.get(this); if (r != null) { @@ -841,10 +854,10 @@ protected int termPrio(TermImpl goal, List der, Map or(List rules, int non, List der, Map> rec) { + private Set or(List rules, int non, List der, Map> rec, Database database) { Set r = Set.of(); for (RuleImpl rule : rules) { - Set eval = rule.eval(this, der, rec); + Set eval = rule.eval(this, der, rec, database); if (non == 0 && eval.equals(Set.of(this))) { return (Set) eval; } @@ -1072,7 +1085,7 @@ private int resultIndex() { @SuppressWarnings({"rawtypes", "unchecked"}) @Override - protected Collection match(TermImpl goal, List der, Map> rec) { + protected Collection match(TermImpl goal, List der, Map> rec, Database database) { Map localVars = ((CollectImpl) goal).localVariables(); int ii = ((CollectImpl) goal).identityIndex(); int ri = ((CollectImpl) goal).resultIndex(); @@ -1081,7 +1094,7 @@ protected Collection match(TermImpl goal, List der, Map rs = Set.of(accum.getTerm(ii)); Set inc = Set.of(); - for (TermImpl pm : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec)) { + for (TermImpl pm : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec, database)) { if (pm.isIncomplete()) { inc = inc.add(pm); } else { @@ -1089,7 +1102,7 @@ protected Collection match(TermImpl goal, List der, Map a = Set.of(); for (TermImpl r : rs) { TermImpl s = accum.setBinding(b).set(ii, r); - for (TermImpl am : ((TermImpl) s).match(goalAccum, der, rec)) { + for (TermImpl am : ((TermImpl) s).match(goalAccum, der, rec, database)) { if (am.isIncomplete()) { inc = inc.add(am); } else { @@ -1105,8 +1118,8 @@ protected Collection match(TermImpl goal, List der, Map der, Map> rec) { - return super.termPrio(goal, der, rec); + protected int termPrio(TermImpl goal, List der, Map> rec, Database database) { + return super.termPrio(goal, der, rec, database); } @SuppressWarnings("rawtypes") @@ -1129,7 +1142,9 @@ public static interface Rule extends Term { public static Rule rule(Pred pred, Goal goal) { RuleImpl ruleImpl = new RuleImpl(pred, goal); TermImpl termImpl = Logic. unproxy(pred); - RULES.force(termImpl.functor(), ADD_RULE, ruleImpl); + FunctImpl functor = termImpl.functor(); + Database database = DATABASE.get(); + database.rules.updateAndGet(m -> m.put(functor, ADD_RULE.apply(m.get(functor), ruleImpl))); return ruleImpl.proxy(); } @@ -1166,7 +1181,7 @@ protected final GoalImpl goal() { } @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set eval(TermImpl term, List der, Map> rec) { + protected Set eval(TermImpl term, List der, Map> rec, Database database) { TermImpl head = term(); Map binding = head.getBinding(term, Map.of()); if (binding == null) { @@ -1175,7 +1190,7 @@ protected Set eval(TermImpl term, List der, Map> r = goal().eval(variables().putAll(binding), der, rec); + Collection> r = goal().eval(variables().putAll(binding), der, rec, database); return r.map(m -> { TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); return it != null ? it : head.setBinding(m); @@ -1263,12 +1278,12 @@ protected GoalImpl term(Object[] array) { @SuppressWarnings("rawtypes") public Collection> eval() { - return eval(variables(), List.of(), Map.of()); + return eval(variables(), List.of(), Map.of(), DATABASE.get()); } @SuppressWarnings("rawtypes") - protected Collection> eval(Map vars, List der, Map> rec) { - return eval(goals(), Set.of(vars), der, rec); + protected Collection> eval(Map vars, List der, Map> rec, Database database) { + return eval(goals(), Set.of(vars), der, rec, database); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -1277,7 +1292,7 @@ protected List goals() { } @SuppressWarnings({"rawtypes", "unchecked"}) - private Collection> eval(List goals, Collection> vars, List der, Map> rec) { + private Collection> eval(List goals, Collection> vars, List der, Map> rec, Database database) { if (goals.isEmpty()) { return vars; } @@ -1289,10 +1304,10 @@ private Collection> eval(List goals, Collection m = f.match(g, der, rec); + Collection m = f.match(g, der, rec, database); return eval(goals.removeIndex(i), m.> map(t -> { if (t.type() == Incomplete.class) { return Map.of(Entry.of(INCOMPLETE_VAR, t)); @@ -1300,16 +1315,16 @@ private Collection> eval(List goals, Collection b = g.getBinding(t, Map.of()); return b == null ? Map.of() : v.putAll(b); } - }), der, rec); + }), der, rec, database); }); } @SuppressWarnings({"rawtypes", "unchecked"}) - private static int first(List actual, List goals, List der, Map> rec) { + private static int first(List actual, List goals, List der, Map> rec, Database database) { int first = -1; int min = Integer.MAX_VALUE; for (int i = 0; i < actual.size(); i++) { - int prio = actual.get(i).termPrio(goals.get(i), der, rec); + int prio = actual.get(i).termPrio(goals.get(i), der, rec, database); if (first == -1 || prio < min) { first = i; min = prio; @@ -1376,7 +1391,7 @@ public static Pred eq(Term a, Term b) { @SuppressWarnings({"unchecked", "rawtypes"}) public static void fact(Rel rel) { - Logic. unproxy(rel).makeFact(); + Logic. unproxy(rel).makeFact(DATABASE.get()); } // Is diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java index 08486ad1..73215fdc 100644 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java @@ -24,17 +24,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.modelingvalue.dclare.logic.Arithmetic.*; import static org.modelingvalue.dclare.logic.Logic.*; -import static org.modelingvalue.dclare.test.support.Shared.THE_POOL; - -import java.util.concurrent.ThreadLocalRandom; import org.junit.jupiter.api.RepeatedTest; -import org.modelingvalue.collections.Collection; import org.modelingvalue.collections.Map; import org.modelingvalue.collections.Set; import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.dclare.Universe; -import org.modelingvalue.dclare.UniverseTransaction; import org.modelingvalue.dclare.logic.Arithmetic.IntAtom; import org.modelingvalue.dclare.logic.Logic; import org.modelingvalue.dclare.logic.Logic.*; @@ -44,11 +38,7 @@ public class LogicTest { // Utilities void run(Runnable test) { - UniverseTransaction universeTransaction = new UniverseTransaction(Universe.of(), THE_POOL); - boolean seq = ThreadLocalRandom.current().nextBoolean(); - universeTransaction.put("test", seq ? Collection.sequential(test) : test); - universeTransaction.stop(); - universeTransaction.waitForEnd(); + Logic.run(test); } static void isTrue(Goal goal) { From 91a157b444f7d8d239011ce9b53e5dbd1a4bd168 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 09:16:55 +0100 Subject: [PATCH 143/179] remove logic from DClare --- .../{dclare => }/logic/Arithmetic.java | 0 .../{dclare => }/logic/Logic.java | 0 .../modelingvalue/dclare/test/LogicTest.java | 379 ------------------ 3 files changed, 379 deletions(-) rename src/main/java/org/modelingvalue/{dclare => }/logic/Arithmetic.java (100%) rename src/main/java/org/modelingvalue/{dclare => }/logic/Logic.java (100%) delete mode 100644 src/test/java/org/modelingvalue/dclare/test/LogicTest.java diff --git a/src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java b/src/main/java/org/modelingvalue/logic/Arithmetic.java similarity index 100% rename from src/main/java/org/modelingvalue/dclare/logic/Arithmetic.java rename to src/main/java/org/modelingvalue/logic/Arithmetic.java diff --git a/src/main/java/org/modelingvalue/dclare/logic/Logic.java b/src/main/java/org/modelingvalue/logic/Logic.java similarity index 100% rename from src/main/java/org/modelingvalue/dclare/logic/Logic.java rename to src/main/java/org/modelingvalue/logic/Logic.java diff --git a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java b/src/test/java/org/modelingvalue/dclare/test/LogicTest.java deleted file mode 100644 index 73215fdc..00000000 --- a/src/test/java/org/modelingvalue/dclare/test/LogicTest.java +++ /dev/null @@ -1,379 +0,0 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus ~ -// ~ -// Contributors: ~ -// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ -// --------------------------------------------------------------------------------------------------------------------- ~ -// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ -// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ -// but also our friend. "He will live on in many of the lines of code you see below." ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -package org.modelingvalue.dclare.test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.modelingvalue.dclare.logic.Arithmetic.*; -import static org.modelingvalue.dclare.logic.Logic.*; - -import org.junit.jupiter.api.RepeatedTest; -import org.modelingvalue.collections.Map; -import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.dclare.logic.Arithmetic.IntAtom; -import org.modelingvalue.dclare.logic.Logic; -import org.modelingvalue.dclare.logic.Logic.*; - -public class LogicTest { - - // Utilities - - void run(Runnable test) { - Logic.run(test); - } - - static void isTrue(Goal goal) { - assertTrue(Logic.isTrue(goal)); - } - - static void isFalse(Goal goal) { - assertTrue(Logic.isFalse(goal)); - } - - static void isIncomplete(Goal goal) { - assertTrue(Logic.isIncomplete(goal)); - } - - @SafeVarargs - static void hasBindings(Goal goal, Map... bindings) { - assertEquals(Set.of(bindings), getBindings(goal)); - } - - // Root - - interface Root extends Term { - } - - interface RootAtom extends Root, Atom { - } - - interface RootFunc extends Root, Func { - } - - static Functor rootAtom = functor((SerializableFunction) LogicTest::root); - - static RootAtom root(String name) { - return term(rootAtom, name); - } - - static RootAtom rootAtomVar(String name) { - return var(RootAtom.class, name); - } - - static Root rootVar(String name) { - return var(Root.class, name); - } - - static Functor rootPerson = functor(LogicTest::rootPerson); - - static Pred rootPerson(RootAtom root, PersonAtom person) { - return term(rootPerson, root, person); - } - - static Functor rootFunc = functor((SerializableFunction) LogicTest::root); - - static RootFunc root(Person person) { - return term(rootFunc, person); - } - - // Family Tree - - interface Person extends Term { - } - - interface PersonAtom extends Person, Atom { - } - - interface PersonFunc extends Person, Func { - } - - static Functor strPerson = functor((SerializableFunction) LogicTest::person); - - static PersonAtom person(String name) { - return term(strPerson, name); - } - - static Functor intPerson = functor((SerializableFunction) LogicTest::person); - - static PersonAtom person(IntAtom i) { - return term(intPerson, i); - } - - static PersonAtom person(int i) { - return person(i(i)); - } - - static PersonAtom personAtomVar(String name) { - return var(PersonAtom.class, name); - } - - static Person personVar(String name) { - return var(Person.class, name); - } - - static Functor parentChild = functor(LogicTest::parentChild); - - static Rel parentChild(PersonAtom parent, PersonAtom child) { - return term(parentChild, parent, child); - } - - static Functor parent = functor(LogicTest::parent); - - static PersonFunc parent(Person child) { - return term(parent, child); - } - - static Functor child = functor(LogicTest::child); - - static PersonFunc child(Person parent) { - return term(child, parent); - } - - static Functor ancestorDescendent = functor(LogicTest::ancestorDescendent); - - static Pred ancestorDescendent(PersonAtom ancestor, PersonAtom descendent) { - return term(ancestorDescendent, ancestor, descendent); - } - - static Functor ancestor = functor(LogicTest::ancestor); - - static PersonFunc ancestor(Person descendent) { - return term(ancestor, descendent); - } - - static Functor descendent = functor(LogicTest::descendent); - - static PersonFunc descendent(Person ancestor) { - return term(descendent, ancestor); - } - - // Variables - - IntAtom P = iav("P"); - IntAtom Q = iav("Q"); - - PersonAtom A = personAtomVar("A"); - PersonAtom B = personAtomVar("B"); - PersonAtom C = personAtomVar("C"); - - Person X = personVar("X"); - Person Y = personVar("Y"); - Person Z = personVar("Z"); - - RootAtom U = rootAtomVar("U"); - Root V = rootVar("V"); - - @SuppressWarnings("unchecked") - L PL = var(L.class, "PL"); - - // Terms - - PersonAtom Carel = person("Carel"); - PersonAtom Jan = person("Jan"); - PersonAtom Elske = person("Elske"); - PersonAtom Wim = person("Wim"); - PersonAtom Joppe = person("Joppe"); - PersonAtom Heleen = person("Heleen"); - PersonAtom Marijn = person("Marijn"); - - RootAtom Root = root("Root"); - - // Root Rules - - private void rootRules() { - arithmeticRules(); - - rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); - rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); - - rule(is(root(X), U), goal(is(X, B), rootPerson(U, B))); - - rule(parentChild(person(Q), person(P)), goal(lt(Q, i(4)), is(plus(Q, i(1)), P))); - rule(rootPerson(U, person(0)), goal()); - rule(rootPerson(U, C), goal(rootPerson(U, A), parentChild(A, C))); - } - - // Family Rules - - private void familyRules() { - isRules(); - - rule(is(parent(X), A), goal(is(X, B), parentChild(A, B))); - rule(is(child(X), A), goal(is(X, B), parentChild(B, A))); - - rule(is(ancestor(X), A), goal(is(X, B), ancestorDescendent(A, B))); - rule(is(descendent(X), A), goal(is(X, B), ancestorDescendent(B, A))); - - rule(ancestorDescendent(A, C), goal(parentChild(A, C))); - rule(ancestorDescendent(A, C), goal(ancestorDescendent(A, B), parentChild(B, C))); - } - - @RepeatedTest(100) - public void famTest0() { - run(() -> { - familyRules(); - - fact(parentChild(Carel, Jan)); - fact(parentChild(Jan, Wim)); - fact(parentChild(Elske, Wim)); - fact(parentChild(Wim, Joppe)); - fact(parentChild(Heleen, Joppe)); - fact(parentChild(Wim, Marijn)); - fact(parentChild(Heleen, Marijn)); - - isTrue(goal(is(parent(Joppe), Heleen))); - isTrue(goal(is(Wim, child(Jan)))); - - isFalse(goal(is(Marijn, parent(Wim)))); - isFalse(goal(is(parent(Wim), Heleen))); - isFalse(goal(is(child(Wim), Wim))); - - isTrue(goal(is(ancestor(Marijn), Wim))); - isTrue(goal(is(descendent(Carel), Marijn))); - - isFalse(goal(is(descendent(Marijn), Wim))); - isFalse(goal(is(descendent(Heleen), Wim))); - isFalse(goal(is(descendent(Joppe), Carel))); - isFalse(goal(is(descendent(Carel), Carel))); - }); - } - - @RepeatedTest(100) - public void famTest1() { - run(() -> { - familyRules(); - - fact(parentChild(Carel, Jan)); - fact(parentChild(Jan, Wim)); - fact(parentChild(Elske, Wim)); - fact(parentChild(Wim, Joppe)); - fact(parentChild(Heleen, Joppe)); - fact(parentChild(Wim, Marijn)); - fact(parentChild(Heleen, Marijn)); - - isTrue(goal(parentChild(Heleen, Joppe))); - isTrue(goal(parentChild(Jan, Wim))); - - isFalse(goal(parentChild(Marijn, Wim))); - isFalse(goal(parentChild(Heleen, Wim))); - isFalse(goal(parentChild(Wim, Wim))); - - isTrue(goal(ancestorDescendent(Wim, Marijn))); - isTrue(goal(ancestorDescendent(Carel, Marijn))); - - isFalse(goal(ancestorDescendent(Marijn, Wim))); - isFalse(goal(ancestorDescendent(Heleen, Wim))); - isFalse(goal(ancestorDescendent(Joppe, Carel))); - isFalse(goal(ancestorDescendent(Carel, Carel))); - - hasBindings(goal(collect(parentChild(Wim, C), add(C, l(), PL))), binding(PL, l(Joppe, Marijn))); - }); - } - - @RepeatedTest(100) - public void famTest2() { - run(() -> { - familyRules(); - - PersonAtom Carel = person("Carel"); - PersonAtom Jan = person("Jan"); - PersonAtom Wim = person("Wim"); - - fact(parentChild(Carel, Jan)); - fact(parentChild(Jan, Wim)); - - hasBindings(goal(ancestorDescendent(A, Wim)), binding(A, Jan), binding(A, Carel)); - hasBindings(goal(ancestorDescendent(Carel, C)), binding(C, Jan), binding(C, Wim)); - }); - } - - @RepeatedTest(100) - public void famTest3() { - run(() -> { - rule(parentChild(B, C), goal(parentChild(B, C))); - - PersonAtom Jan = person("Jan"); - PersonAtom Wim = person("Wim"); - - hasBindings(goal(parentChild(Wim, Jan)), incomplete(parentChild(Wim, Jan), parentChild(Wim, Jan))); - isIncomplete(goal(parentChild(Wim, Jan))); - }); - } - - @RepeatedTest(100) - public void famTest4() { - run(() -> { - rootRules(); - - isTrue(goal(is(child(person(0)), person(1)))); - isTrue(goal(is(child(person(3)), person(4)))); - isFalse(goal(is(child(person(4)), person(5)))); - - isTrue(goal(is(root(person(0)), Root))); - isTrue(goal(is(root(person(1)), Root))); - isTrue(goal(is(root(person(4)), Root))); - isTrue(goal(is(root(person(3)), Root))); - isTrue(goal(is(root(person(2)), Root))); - - hasBindings(goal(is(root(C), Root)), binding(C, person(0)), binding(C, person(1)), // - binding(C, person(2)), binding(C, person(3)), binding(C, person(4))); - }); - } - - @RepeatedTest(100) - public void intTest() { - run(() -> { - arithmeticRules(); - - hasBindings(goal(plus(i(7), i(3), P)), binding(P, i(10))); - hasBindings(goal(plus(i(7), P, i(10))), binding(P, i(3))); - hasBindings(goal(plus(P, i(3), i(10))), binding(P, i(7))); - }); - } - - @RepeatedTest(100) - public void isTest() { - run(() -> { - arithmeticRules(); - - isTrue(goal(is(plus(i(11), i(22)), i(33)))); - isTrue(goal(is(minus(i(33), i(22)), i(11)))); - isTrue(goal(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), i(110)))); - - isTrue(goal(is(plus(i(11), divide(multiply(i(44), i(33)), i(22))), i(77)))); - - isTrue(goal(is(sqrt(i(49)), i(7)))); - isTrue(goal(is(sqrt(i(49)), i(-7)))); - - hasBindings(goal(is(plus(i(11), plus(plus(i(22), i(33)), i(44))), P)), binding(P, i(110))); - hasBindings(goal(is(plus(i(11), plus(plus(i(22), P), i(44))), i(110))), binding(P, i(33))); - hasBindings(goal(is(plus(i(7), i(3)), P)), binding(P, i(10))); - hasBindings(goal(is(plus(i(7), P), i(10))), binding(P, i(3))); - hasBindings(goal(is(plus(P, i(3)), i(10))), binding(P, i(7))); - - hasBindings(goal(is(sqrt(i(49)), P)), binding(P, i(7)), binding(P, i(-7))); - - hasBindings(goal(collect(is(sqrt(i(49)), P), plus(P, i(0), Q))), binding(Q, i(0))); - }); - } - -} From 6506e96209fd30ee77219ca5a30e803a85acaf47 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 10 Dec 2024 09:17:15 +0100 Subject: [PATCH 144/179] remove Logic from DClare --- .../org/modelingvalue/logic/Arithmetic.java | 263 --- .../java/org/modelingvalue/logic/Logic.java | 1440 ----------------- 2 files changed, 1703 deletions(-) delete mode 100644 src/main/java/org/modelingvalue/logic/Arithmetic.java delete mode 100644 src/main/java/org/modelingvalue/logic/Logic.java diff --git a/src/main/java/org/modelingvalue/logic/Arithmetic.java b/src/main/java/org/modelingvalue/logic/Arithmetic.java deleted file mode 100644 index f72cac4b..00000000 --- a/src/main/java/org/modelingvalue/logic/Arithmetic.java +++ /dev/null @@ -1,263 +0,0 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus ~ -// ~ -// Contributors: ~ -// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ -// --------------------------------------------------------------------------------------------------------------------- ~ -// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ -// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ -// but also our friend. "He will live on in many of the lines of code you see below." ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -package org.modelingvalue.dclare.logic; - -import static org.modelingvalue.dclare.logic.Logic.*; - -import java.math.BigInteger; - -import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.util.SerializableBiFunction; -import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.collections.util.SerializableTriFunction; -import org.modelingvalue.dclare.logic.Logic.Atom; -import org.modelingvalue.dclare.logic.Logic.Func; -import org.modelingvalue.dclare.logic.Logic.Functor; -import org.modelingvalue.dclare.logic.Logic.Pred; -import org.modelingvalue.dclare.logic.Logic.Term; -import org.modelingvalue.dclare.logic.Logic.TermImpl; - -public final class Arithmetic { - - private Arithmetic() { - } - - // Integer - - public static interface Int extends Term { - } - - public static interface IntAtom extends Int, Atom { - } - - public static interface IntFunc extends Int, Func { - } - - private static Functor i = functor((SerializableFunction) Arithmetic::i); - - private static IntAtom i(BigInteger x) { - return term(i, x); - } - - public static IntAtom i(long x) { - return i(BigInteger.valueOf(x)); - } - - public static IntAtom iav(String name) { - return var(IntAtom.class, name); - } - - public static Int iv(String name) { - return var(Int.class, name); - } - - // Operators - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor compare = functor((SerializableTriFunction) Arithmetic::compare, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null) { - BigInteger r = BigInteger.valueOf(ai.compareTo(bi)); - if (ci != null) { - return ci.equals(r) ? Set.of(t) : Set.of(); - } else { - return Set.of(t.set(3, at.set(1, r))); - } - } else if (BigInteger.ZERO.equals(ci)) { - if (ai != null) { - return Set.of(t.set(2, at)); - } else if (bi != null) { - return Set.of(t.set(1, bt)); - } - } - return t.incomplete(); - }); - - public static Pred compare(IntAtom a, IntAtom b, IntAtom c) { - return term(compare, a, b, c); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor plusPred = functor((SerializableTriFunction) Arithmetic::plus, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null && ci != null) { - return ai.add(bi).equals(ci) ? Set.of(t) : Set.of(); - } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, at.set(1, ai.add(bi)))); - } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, at.set(1, ci.subtract(ai)))); - } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, bt.set(1, ci.subtract(bi)))); - } else { - return t.incomplete(); - } - }); - - public static Pred plus(IntAtom a, IntAtom b, IntAtom r) { - return term(plusPred, a, b, r); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor multiplyPred = functor((SerializableTriFunction) Arithmetic::multiply, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - TermImpl ct = t.getTerm(3); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - BigInteger ci = ct != null ? ct.getVal(1) : null; - if (ai != null && bi != null && ci != null) { - return ai.multiply(bi).equals(ci) ? Set.of(t) : Set.of(); - } else if (ai != null && bi != null && ci == null) { - return Set.of(t.set(3, at.set(1, ai.multiply(bi)))); - } else if (ai != null && bi == null && ci != null) { - return Set.of(t.set(2, at.set(1, ci.divide(ai)))); - } else if (ai == null && bi != null && ci != null) { - return Set.of(t.set(1, bt.set(1, ci.divide(bi)))); - } else { - return t.incomplete(); - } - }); - - public static Pred multiply(IntAtom a, IntAtom b, IntAtom r) { - return term(multiplyPred, a, b, r); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor powerPred = functor((SerializableBiFunction) Arithmetic::power, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - BigInteger ai = at != null ? at.getVal(1) : null; - BigInteger bi = bt != null ? bt.getVal(1) : null; - if (ai != null && bi != null) { - return ai.multiply(ai).equals(bi) ? Set.of(t) : Set.of(); - } else if (ai != null && bi == null) { - return Set.of(t.set(2, at.set(1, ai.multiply(ai)))); - } else if (ai == null && bi != null) { - BigInteger sqrt = bi.sqrt(); - return Set.of(t.set(1, bt.set(1, sqrt)), t.set(1, bt.set(1, sqrt.negate()))); - } else { - return t.incomplete(); - } - }); - - public static Pred power(IntAtom a, IntAtom r) { - return term(powerPred, a, r); - } - - // Functions - - private static Functor gt = functor(Arithmetic::gt); - - public static Pred gt(Int a, Int b) { - return term(gt, a, b); - } - - private static Functor lt = functor(Arithmetic::lt); - - public static Pred lt(Int a, Int b) { - return term(lt, a, b); - } - - private static Functor ge = functor(Arithmetic::ge); - - public static Pred ge(Int a, Int b) { - return term(ge, a, b); - } - - private static Functor le = functor(Arithmetic::le); - - public static Pred le(Int a, Int b) { - return term(le, a, b); - } - - private static Functor plusFunc = functor((SerializableBiFunction) Arithmetic::plus); - - public static IntFunc plus(Int a, Int b) { - return term(plusFunc, a, b); - } - - private static Functor minusFunc = functor((SerializableBiFunction) Arithmetic::minus); - - public static IntFunc minus(Int a, Int b) { - return term(minusFunc, a, b); - } - - private static Functor multiplyFunc = functor((SerializableBiFunction) Arithmetic::multiply); - - public static IntFunc multiply(Int a, Int b) { - return term(multiplyFunc, a, b); - } - - private static Functor divideFunc = functor((SerializableBiFunction) Arithmetic::divide); - - public static IntFunc divide(Int a, Int b) { - return term(divideFunc, a, b); - } - - private static Functor powerFunc = functor((SerializableFunction) Arithmetic::power); - - public static IntFunc power(Int a) { - return term(powerFunc, a); - } - - private static Functor sqrtFunc = functor((SerializableFunction) Arithmetic::sqrt); - - public static IntFunc sqrt(Int a) { - return term(sqrtFunc, a); - } - - // Is Rules - - public static void arithmeticRules() { - isRules(); - - IntAtom P = iav("PL"); - IntAtom Q = iav("QL"); - IntAtom R = iav("RL"); - - Int X = iv("X"); - Int Y = iv("Y"); - - rule(is(plus(X, Y), R), goal(is(X, P), is(Y, Q), plus(P, Q, R))); - rule(is(minus(X, Y), R), goal(is(X, P), is(Y, Q), plus(R, Q, P))); - rule(is(multiply(X, Y), R), goal(is(X, P), is(Y, Q), multiply(P, Q, R))); - rule(is(divide(X, Y), R), goal(is(X, P), is(Y, Q), multiply(R, Q, P))); - rule(is(power(X), R), goal(is(X, P), power(P, R))); - rule(is(sqrt(X), R), goal(is(X, P), power(R, P))); - rule(gt(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(1)))); - rule(lt(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(-1)))); - rule(ge(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(1)))); - rule(ge(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(0)))); - rule(le(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(-1)))); - rule(le(X, Y), goal(is(X, P), is(Y, Q), compare(P, Q, i(0)))); - } - -} diff --git a/src/main/java/org/modelingvalue/logic/Logic.java b/src/main/java/org/modelingvalue/logic/Logic.java deleted file mode 100644 index ec85cae2..00000000 --- a/src/main/java/org/modelingvalue/logic/Logic.java +++ /dev/null @@ -1,1440 +0,0 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ -// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ -// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ -// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ -// specific language governing permissions and limitations under the License. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus ~ -// ~ -// Contributors: ~ -// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ -// --------------------------------------------------------------------------------------------------------------------- ~ -// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ -// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ -// but also our friend. "He will live on in many of the lines of code you see below." ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -package org.modelingvalue.dclare.logic; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.BiFunction; -import java.util.function.Function; - -import org.modelingvalue.collections.Collection; -import org.modelingvalue.collections.Entry; -import org.modelingvalue.collections.List; -import org.modelingvalue.collections.Map; -import org.modelingvalue.collections.Set; -import org.modelingvalue.collections.struct.impl.StructImpl; -import org.modelingvalue.collections.util.Context; -import org.modelingvalue.collections.util.SerializableBiFunction; -import org.modelingvalue.collections.util.SerializableBiFunction.SerializableBiFunctionImpl; -import org.modelingvalue.collections.util.SerializableFunction; -import org.modelingvalue.collections.util.SerializableFunction.SerializableFunctionImpl; -import org.modelingvalue.collections.util.SerializableQuadFunction; -import org.modelingvalue.collections.util.SerializableQuadFunction.SerializableQuadFunctionImpl; -import org.modelingvalue.collections.util.SerializableSupplier; -import org.modelingvalue.collections.util.SerializableSupplier.SerializableSupplierImpl; -import org.modelingvalue.collections.util.SerializableTriFunction; -import org.modelingvalue.collections.util.SerializableTriFunction.SerializableTriFunctionImpl; -import org.modelingvalue.collections.util.StringUtil; - -public final class Logic { - - private Logic() { - } - - private static final Context DATABASE = Context.of(); - - public static final void run(Runnable runnable) { - DATABASE.run(new Database(), runnable); - } - - @SuppressWarnings("rawtypes") - private static final class Database { - private final AtomicReference>> facts = new AtomicReference<>(Map.of()); - private final AtomicReference>> rules = new AtomicReference<>(Map.of()); - } - - private static final boolean TRACE_LOGIC = Boolean.getBoolean("TRACE_LOGIC"); - - @SuppressWarnings("rawtypes") - private static final BiFunction, TermImpl, Set> ADD_FACT = (s, e) -> s == null ? Set.of(e) : s.add(e); - - private static final BiFunction, RuleImpl, List> ADD_RULE = (l, e) -> { - if (l == null) { - return List.of(e); - } else { - int p = e.rulePrio(); - for (int i = 0; i < l.size(); i++) { - RuleImpl r = l.get(i); - if (r.equals(e)) { - return l; - } else if (r.rulePrio() > p) { - return l.insert(i, e); - } - } - return l.append(e); - } - }; - - private static abstract class ClauseImpl extends StructImpl implements InvocationHandler, Comparable> { - private static final long serialVersionUID = 7315776001191198132L; - - private static final Method EQUALS; - private static final Method HASHCODE; - private static final Method TO_STRING; - static { - try { - EQUALS = Object.class.getMethod("equals", Object.class); - HASHCODE = Object.class.getMethod("hashCode"); - TO_STRING = Object.class.getMethod("toString"); - } catch (NoSuchMethodException | SecurityException e) { - throw new Error(e); - } - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - if (method.equals(EQUALS)) { - if (proxy == args[0]) { - return true; - } else if (args[0] == null) { - return false; - } else if (args[0].getClass() != proxy.getClass()) { - return false; - } else { - return super.equals(Logic.unproxy(args[0])); - } - } else if (method.equals(HASHCODE)) { - return super.hashCode(); - } else if (method.equals(TO_STRING)) { - return toString(); - } else { - throw new Error("No handler for " + method); - } - } - - protected ClauseImpl(Functor functor, Object... args) { - super(unproxy(functor, args)); - } - - protected ClauseImpl(FunctImpl functor, Object... args) { - super(array(functor, args)); - } - - protected ClauseImpl(Class type, Object... args) { - super(array(type, args)); - } - - protected ClauseImpl(Object[] args) { - super(args); - } - - private static final Object[] array(Object functor, Object[] args) { - Object[] result = new Object[args.length + 1]; - result[0] = noProxy(functor); - for (int i = 0; i < args.length; i++) { - result[i + 1] = noProxy(args[i]); - } - return result; - } - - @SuppressWarnings("rawtypes") - private static final Object[] unproxy(Functor functor, Object[] args) { - Object[] result = new Object[args.length + 1]; - result[0] = Logic.unproxy(functor); - for (int i = 0; i < args.length; i++) { - result[i + 1] = Logic.unproxy(args[i]); - } - return result; - } - - protected abstract F proxy(); - - protected abstract Class type(); - - protected abstract ClauseImpl term(Object[] array); - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public int compareTo(ClauseImpl o) { - int r = length() - o.length(); - if (r != 0) { - return r; - } - for (int i = 0; i < length(); i++) { - Object tv = get(i); - Object ov = o.get(i); - if (tv instanceof Comparable && tv.getClass().equals(ov.getClass())) { - r = ((Comparable) tv).compareTo(ov); - if (r != 0) { - break; - } - } else { - String ts = StringUtil.toString(tv); - String os = StringUtil.toString(ov); - r = ts.compareTo(os); - if (r != 0) { - break; - } - } - } - return r; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected ClauseImpl eq(ClauseImpl other) { - if (this == other) { - return this; - } - Object[] array = toArray(); - for (int i = 0; i < array.length; i++) { - Object tv = get(i); - Object ov = other.get(i); - if (tv != ov) { - if (tv instanceof ClauseImpl && ov instanceof ClauseImpl) { - ClauseImpl eq = ((ClauseImpl) tv).eq((ClauseImpl) ov); - if (eq != null) { - array[i] = eq; - } else { - return null; - } - } else if (tv instanceof ClauseImpl && ov instanceof Class) { - if (((Class) ov).isAssignableFrom(((ClauseImpl) tv).type())) { - array[i] = tv; - } else { - return null; - } - } else if (tv instanceof Class && ov instanceof ClauseImpl) { - if (((Class) tv).isAssignableFrom(((ClauseImpl) ov).type())) { - array[i] = ov; - } else { - return null; - } - } else if (!(tv instanceof Class) && ov instanceof Class) { - if (((Class) ov).isAssignableFrom(tv.getClass())) { - array[i] = tv; - } else { - return null; - } - } else if (tv instanceof Class && !(ov instanceof Class)) { - if (((Class) tv).isAssignableFrom(ov.getClass())) { - array[i] = ov; - } else { - return null; - } - } else if (!Objects.equals(tv, ov)) { - return null; - } - } - } - return term(array); - } - } - - private static final Object noProxy(Object object) { - if (object instanceof Term) { - throw new IllegalArgumentException(); - } else { - return object; - } - } - - @SuppressWarnings("rawtypes") - protected static final Object unproxy(Object object) { - if (object instanceof Term) { - return Proxy.getInvocationHandler(object); - } else { - Objects.requireNonNull(object); - return object; - } - } - - @SuppressWarnings("unchecked") - private static final > R unproxy(T object) { - return (R) Proxy.getInvocationHandler(object); - } - - @SuppressWarnings("rawtypes") - private static final Object proxy(Object object) { - if (object instanceof ClauseImpl) { - return ((ClauseImpl) object).proxy(); - } else { - return object; - } - } - - // Functor - - public interface Functor extends Term { - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static FunctImpl functImpl(SerializableSupplier method, SerializableFunction, Collection> impl) { - SerializableSupplierImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Functor functor(SerializableSupplier method, SerializableFunction, Collection> impl) { - return functImpl(method, impl).proxy(); - } - - @SuppressWarnings("unchecked") - public static Functor functor(SerializableSupplier method) { - return functImpl(method, null).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static FunctImpl functImpl(SerializableFunction method, SerializableFunction, Collection> impl) { - SerializableFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Functor functor(SerializableFunction method, SerializableFunction, Collection> impl) { - return functImpl(method, impl).proxy(); - } - - @SuppressWarnings("unchecked") - public static Functor functor(SerializableFunction method) { - return functImpl(method, null).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static FunctImpl functImpl(SerializableBiFunction method, SerializableFunction, Collection> impl) { - SerializableBiFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Functor functor(SerializableBiFunction method, SerializableFunction, Collection> impl) { - return functImpl(method, impl.of()).proxy(); - } - - @SuppressWarnings("unchecked") - public static Functor functor(SerializableBiFunction method) { - return functImpl(method, null).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static FunctImpl functImpl(SerializableTriFunction method, SerializableFunction, Collection> impl) { - SerializableTriFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Functor functor(SerializableTriFunction method, SerializableFunction, Collection> impl) { - return functImpl(method, impl).proxy(); - } - - @SuppressWarnings("unchecked") - public static Functor functor(SerializableTriFunction method) { - return functImpl(method, null).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static FunctImpl functImpl(SerializableQuadFunction method, SerializableFunction, Collection> impl) { - SerializableQuadFunctionImpl l = method.of(); - return new FunctImpl((Class) l.out(), l.getImplMethodName(), l.in(), impl != null ? impl.of() : null); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Functor functor(SerializableQuadFunction method, SerializableFunction, Collection> impl) { - return functImpl(method, impl).proxy(); - } - - @SuppressWarnings("unchecked") - public static Functor functor(SerializableQuadFunction method) { - return functImpl(method, null).proxy(); - } - - public static final class FunctImpl extends ClauseImpl> { - private static final long serialVersionUID = 285147889847599160L; - - @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Class type, String name, List> args, SerializableFunction, Collection> l) { - super((Class) Functor.class, type, name, args, l); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private FunctImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - protected final Functor proxy() { - return (Functor) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Functor.class}, this); - } - - @Override - public String toString() { - return ((String) get(2)); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - protected FunctImpl term(Object[] array) { - return new FunctImpl(array); - } - - @SuppressWarnings("unchecked") - @Override - protected Class> type() { - return (Class>) get(0); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - protected List args() { - return (List) get(3); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - protected SerializableFunction, Collection> lambda() { - return (SerializableFunction, Collection>) get(4); - } - - @SuppressWarnings("unchecked") - protected Class functType() { - return (Class) get(1); - } - } - - // Lists - - public interface L extends Term { - } - - @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_0 = functImpl((SerializableSupplier) Logic::l, null); - @SuppressWarnings("rawtypes") - private static final FunctImpl LIST_FUNCTOR_2 = functImpl((SerializableBiFunction) Logic::l, null); - @SuppressWarnings("rawtypes") - private static final Functor LIST_FUNCTOR_2_PROXY = LIST_FUNCTOR_2.proxy(); - @SuppressWarnings("rawtypes") - private static final TermImpl EMPTY_LIST = termImpl(LIST_FUNCTOR_0); - @SuppressWarnings("rawtypes") - private static final L EMPTY_LIST_PROXY = EMPTY_LIST.proxy(); - - @SuppressWarnings("unchecked") - public static L l(E head, L tail) { - return term(LIST_FUNCTOR_2_PROXY, head, tail); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static L l() { - return EMPTY_LIST_PROXY; - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static L l(E... es) { - return list(es).proxy(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl list(E... es) { - TermImpl l = EMPTY_LIST; - for (int i = es.length - 1; i >= 0; i--) { - l = termImpl(LIST_FUNCTOR_2, unproxy(es[i]), l); - } - return l; - } - - @SuppressWarnings("rawtypes") - private static TermImpl list(List es) { - TermImpl l = EMPTY_LIST; - for (int i = es.size() - 1; i >= 0; i--) { - l = termImpl(LIST_FUNCTOR_2, unproxy(es.get(i)), l); - } - return l; - } - - // Add - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static List addOrdered(List l, TermImpl e) { - for (int i = 0; i < l.size(); i++) { - if (l.get(i).compareTo(e) > 0) { - return l.insert(i, e); - } - } - return l.append(e); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Set> remove(List l, TermImpl e) { - Set> ls = Set.of(); - for (int i = l.firstIndexOf(e); i >= 0; i = l.firstIndexOf(i, l.size(), e)) { - ls = ls.add(l.removeIndex(i)); - } - return ls; - } - - @SuppressWarnings("rawtypes") - private static final FunctImpl ADD_FUNCTOR = functImpl((SerializableTriFunction) Logic::add, t -> { - TermImpl e = t.getTerm(1); - TermImpl i = t.getTerm(2); - TermImpl o = t.getTerm(3); - List il = i != null ? i.list() : null; - List ol = o != null ? o.list() : null; - if (e != null && il != null && ol != null) { - return addOrdered(il, e).equals(ol) ? Set.of(t) : Set.of(); - } else if (e != null && il != null && ol == null) { - return Set.of(t.set(3, list(addOrdered(il, e)))); - } else if (e != null && il == null && ol != null) { - return remove(ol, e).map(r -> (TermImpl) t.set(2, r)).asSet(); - } else if (e == null && il != null && ol != null) { - if (il.anyMatch(ol::notContains)) { - return Set.of(); - } - return ol.removeAll(il).map(r -> (TermImpl) t.set(1, r)).asSet(); - } else { - return t.incomplete(); - } - }); - @SuppressWarnings("rawtypes") - private static final Functor ADD_FUNCTOR_PROXY = ADD_FUNCTOR.proxy(); - - public static Pred add(E e, L i, L o) { - return term(ADD_FUNCTOR_PROXY, e, i, o); - } - - // Variables - - public static interface Variable extends Term { - } - - @SuppressWarnings("unchecked") - public static F var(Class type, String id) { - return new VarImpl(type, id).proxy(); - } - - private static final class VarImpl extends ClauseImpl { - private static final long serialVersionUID = -8998368070388908726L; - - private VarImpl(Class type, String name) { - super(type, name); - } - - private VarImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings("unchecked") - protected final F proxy() { - return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type(), Variable.class}, this); - } - - @Override - public String toString() { - return get(1).toString(); - } - - @Override - @SuppressWarnings("unchecked") - protected VarImpl term(Object[] array) { - return new VarImpl(array); - } - - @SuppressWarnings("unchecked") - @Override - protected Class type() { - return (Class) get(0); - } - } - - // Terms - - public static interface Term { - } - - public static interface Pred extends Term { - } - - public static interface Rel extends Pred { - } - - @SuppressWarnings("unchecked") - public static F term(Functor functor, Object... args) { - return new TermImpl(functor, args).proxy(); - } - - private static TermImpl termImpl(FunctImpl functor, Object... args) { - return new TermImpl(functor, args); - } - - public static class TermImpl extends ClauseImpl { - private static final long serialVersionUID = -1605559565948158856L; - - private TermImpl(Functor functor, Object... args) { - super(functor, args); - } - - private TermImpl(FunctImpl functor, Object... args) { - super(functor, args); - } - - private TermImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings("unchecked") - protected F proxy() { - return (F) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{type()}, this); - } - - @Override - @SuppressWarnings("unchecked") - protected TermImpl term(Object[] array) { - return new TermImpl(array); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public String toString() { - if (type() == L.class) { - return list().toString().substring(4); - } else { - String string = super.toString(); - return string.substring(1, string.length() - 1).replaceFirst(",", "(") + ")"; - } - } - - public boolean isAtom() { - for (int i = 1; i < length(); i++) { - if (get(i) instanceof TermImpl) { - return false; - } - } - return true; - } - - @SuppressWarnings("unchecked") - @Override - public Class type() { - return functor().functType(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public FunctImpl functor() { - return (FunctImpl) get(0); - } - - @SuppressWarnings("rawtypes") - protected final void makeFact(Database database) { - if (functor().lambda() != null) { - throw new IllegalArgumentException("No facts of a functor with a lambda allowed. " + this); - } - if (database.rules.get().get(functor()) != null) { - throw new IllegalArgumentException("No facts of a functor with rules allowed. " + this); - } - database.facts.updateAndGet(m -> m.put(this, ADD_FACT.apply(m.get(this), this))); - Object[] array = toArray(); - for (int i = 1; i < array.length; i++) { - array[i] = getType(i); - TermImpl term = term(array); - database.facts.updateAndGet(m -> m.put(term, ADD_FACT.apply(m.get(term), this))); - array = toArray(); - } - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected Map variables() { - Map vars = Map.of(); - for (int i = 1; i < length(); i++) { - if (get(i) instanceof VarImpl) { - vars = vars.put((VarImpl) get(i), ((VarImpl) get(i)).type()); - } else if (get(i) instanceof TermImpl) { - vars = vars.putAll(((TermImpl) get(i)).variables()); - } - } - return vars; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected Map getBinding(TermImpl term, Map vars) { - if (get(0).equals(term.get(0))) { - for (int i = 1; i < length(); i++) { - Object tv = term.get(i); - Class tt = typeOf(tv); - tv = tv instanceof Class ? null : tv; - if (get(i) instanceof VarImpl) { - VarImpl var = (VarImpl) get(i); - Object vv = vars.get(var); - Class vt = typeOf(vv); - vv = vv instanceof Class ? null : vv; - if (vv != null) { - if (tv != null && !tv.equals(vv)) { - return null; - } - } else if (tv != null) { - if (var.type().isAssignableFrom(tt)) { - vars = vars.put(var, tv); - } else { - return null; - } - } else if (tt == null || !var.type().isAssignableFrom(tt)) { - return null; - } else if (vt != null && !vt.equals(tt)) { - return null; - } else { - vars = vars.put(var, tt); - } - } else if (get(i) instanceof TermImpl) { - TermImpl t = (TermImpl) get(i); - if (tv != null) { - if (tv instanceof TermImpl) { - vars = t.getBinding((TermImpl) tv, vars); - if (vars == null) { - return null; - } - } else { - return null; - } - } else if (tt == null || !t.type().isAssignableFrom(tt)) { - return null; - } - } else if (tv != null && !tv.equals(get(i))) { - return null; - } - } - return vars; - } else { - return null; - } - } - - @SuppressWarnings("rawtypes") - private static Class typeOf(Object v) { - return v instanceof ClauseImpl ? ((ClauseImpl) v).type() : v instanceof Class ? (Class) v : null; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected TermImpl setBinding(Map vars) { - Object[] array = toArray(); - for (int i = 1; i < length(); i++) { - if (get(i) instanceof VarImpl) { - Object v = vars.get((VarImpl) get(i)); - if (v != null) { - array[i] = v; - } - } else if (get(i) instanceof TermImpl) { - array[i] = ((TermImpl) get(i)).setBinding(vars); - } - } - return term(array); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public TermImpl getTerm(int i) { - Object v = get(i); - return v instanceof TermImpl ? (TermImpl) v : null; - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public Class getType(int i) { - Object v = get(i); - return v instanceof Class ? (Class) v : v instanceof TermImpl ? ((TermImpl) v).type() : null; - } - - @SuppressWarnings("unchecked") - public V getVal(int i) { - Object v = get(i); - return v instanceof Class || v instanceof TermImpl ? null : (V) v; - } - - public TermImpl set(int i, Object v) { - Object[] array = toArray(); - array[i] = v; - return term(array); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - public Set incomplete() { - return Set.of(Logic.incomplete(List.of(this))); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected Collection match(TermImpl goal, List der, Map> rec, Database database) { - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - return lambda.apply(this); - } - int non = nrOfNulls(); - if (non > 1 || non >= totalLength()) { - return Set.of(Logic.incomplete(der.append(this))); - } - Set facts = database.facts.get().get(this); - if (facts != null) { - return facts; - } - List rules = database.rules.get().get(functor()); - if (rules != null) { - Set r = rec.get(this); - if (r != null) { - return r; - } - int i = der.lastIndexOf(this); - if (i >= 0) { - return Set.of(Logic.incomplete(der.append(this))); - } - der = der.append(this); - Set set = Set.of(), add = Set.of(); - boolean found = false, incomplete = false; - do { - add = or(rules, non, der, add.isEmpty() ? rec : rec.put(this, add), database).removeAll(set); - found = add.anyMatch(this::equalFunctor); - incomplete |= add.anyMatch(this::isIncomplete); - if (incomplete && found && set.isEmpty()) { - add = add.filter(this::equalFunctor).asSet(); - } - set = set.addAll(add); - } while (found && incomplete); - memoization(set, database); - return set; - } - return Set.of(); - } - - @SuppressWarnings("rawtypes") - private void memoization(Set set, Database database) { - database.facts.updateAndGet(m -> m.put(this, set)); - for (TermImpl e : set) { - database.facts.updateAndGet(m -> m.put(e, Set.of(e))); - } - } - - @SuppressWarnings("rawtypes") - protected int termPrio(TermImpl goal, List der, Map> rec, Database database) { - int non = nrOfNulls(); - SerializableFunction, Collection> lambda = functor().lambda(); - if (lambda != null) { - Collection result = lambda.apply(this); - if (result instanceof Set) { - Set set = (Set) result; - return set.anyMatch(TermImpl::isIncomplete) ? Integer.MAX_VALUE : Integer.MIN_VALUE + set.size(); - } - return non - nrOfBindings(goal); - } - if (non > 1 || non >= totalLength()) { - return Integer.MAX_VALUE; - } - Set facts = database.facts.get().get(this); - if (facts != null) { - return Integer.MIN_VALUE + facts.size(); - } - List rules = database.rules.get().get(functor()); - if (rules != null) { - Set r = rec.get(this); - if (r != null) { - return Integer.MIN_VALUE + r.size(); - } - for (int i = der.size() - 1; i >= 0; i--) { - TermImpl other = der.get(i); - if (equals(other) || moreNullsThen(other) >= 0) { - return Integer.MAX_VALUE; - } - } - return non - nrOfBindings(goal); - } - return Integer.MIN_VALUE; - } - - @SuppressWarnings("rawtypes") - private Set or(List rules, int non, List der, Map> rec, Database database) { - Set r = Set.of(); - for (RuleImpl rule : rules) { - Set eval = rule.eval(this, der, rec, database); - if (non == 0 && eval.equals(Set.of(this))) { - return (Set) eval; - } - r = r.addAll(eval); - } - return r; - } - - @SuppressWarnings("rawtypes") - private int moreNullsThen(TermImpl other) { - if (!get(0).equals(other.get(0))) { - return Integer.MIN_VALUE; - } - int[] nr = new int[2]; - for (int i = 1; i < length(); i++) { - if (!Objects.equals(get(i), other.get(i))) { - if (get(i) == null || get(i) instanceof Class) { - nr[0]++; - } else if (other.get(i) == null || other.get(i) instanceof Class) { - nr[1]++; - } else if (get(i) instanceof TermImpl && other.get(i) instanceof TermImpl) { - int r = ((TermImpl) get(i)).moreNullsThen((TermImpl) other.get(i)); - if (r == Integer.MIN_VALUE) { - return Integer.MIN_VALUE; - } else { - nr[0] += r; - } - } else { - return Integer.MIN_VALUE; - } - } - } - return nr[0] - nr[1]; - } - - @SuppressWarnings("rawtypes") - protected List list() { - List l = List.of(); - TermImpl t = this; - while (t.length() == 3) { - l = l.add((TermImpl) t.get(1)); - t = (TermImpl) t.get(2); - } - return l; - } - - @SuppressWarnings("rawtypes") - protected int nrOfNulls() { - int nr = 0; - for (int i = 1; i < length(); i++) { - Object v = get(i); - if (v == null || v instanceof Class) { - nr++; - } else if (v instanceof TermImpl) { - nr += ((TermImpl) v).nrOfNulls(); - } - } - return nr; - } - - @SuppressWarnings("rawtypes") - protected int totalLength() { - int nr = 0; - for (int i = 1; i < length(); i++) { - Object v = get(i); - if (v instanceof TermImpl) { - nr += ((TermImpl) v).totalLength(); - } - nr++; - } - return nr; - } - - @SuppressWarnings("rawtypes") - protected int nrOfBindings(TermImpl goal) { - int nr = 0; - for (int i = 1; i < length(); i++) { - Object g = goal.get(i); - Object v = get(i); - if (g instanceof VarImpl && !(v == null || v instanceof Class)) { - nr++; - } else if (g instanceof TermImpl && v instanceof TermImpl) { - nr += ((TermImpl) v).nrOfBindings((TermImpl) g); - } - } - return nr; - } - - @SuppressWarnings("rawtypes") - protected boolean equalFunctor(TermImpl other) { - return functor() == other.functor(); - } - - @SuppressWarnings("rawtypes") - protected boolean isIncomplete(TermImpl other) { - return other.functor() == INCOMPLETE_FUNCTOR && ((TermImpl) other.get(1)).list().contains(this); - } - - protected boolean isIncomplete() { - return functor() == INCOMPLETE_FUNCTOR; - } - - @Override - @SuppressWarnings({"rawtypes", "unchecked"}) - protected TermImpl eq(ClauseImpl other) { - return (TermImpl) super.eq(other); - } - }; - - // Collect - - private static final FunctImpl COLLECT_FUNCTOR = functImpl((SerializableBiFunction) Logic::collect, null); - private static final Functor COLLECT_FUNCTOR_PROXY = COLLECT_FUNCTOR.proxy(); - - @SuppressWarnings("unchecked") - public static Pred collect(Pred pred, Pred accum) { - return new CollectImpl(pred, accum).proxy(); - } - - @SuppressWarnings("rawtypes") - protected static CollectImpl collectImpl(TermImpl pred, TermImpl accum) { - return new CollectImpl(pred, accum); - } - - private static final class CollectImpl extends TermImpl { - private static final long serialVersionUID = -2799691054715131197L; - - private CollectImpl(Pred pred, Pred accum) { - super(COLLECT_FUNCTOR_PROXY, pred, accum); - } - - @SuppressWarnings("rawtypes") - private CollectImpl(TermImpl pred, TermImpl accum) { - super(COLLECT_FUNCTOR, pred, accum); - } - - private CollectImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings("unchecked") - protected Pred proxy() { - return (Pred) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Pred.class}, this); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - protected CollectImpl term(Object[] array) { - return new CollectImpl(array); - } - - @SuppressWarnings("rawtypes") - protected final TermImpl pred() { - return ((TermImpl) get(1)); - } - - @SuppressWarnings("rawtypes") - protected final TermImpl accum() { - return ((TermImpl) get(2)); - } - - @SuppressWarnings("rawtypes") - private Map localVariables; - - @SuppressWarnings("rawtypes") - protected Map localVariables() { - if (localVariables == null) { - Map predVars = pred().variables(); - Map accumVars = accum().variables(); - localVariables = predVars.filter(accumVars::contains).asMap(Function.identity()); - } - return localVariables; - } - - @SuppressWarnings("rawtypes") - private Map variables; - - @SuppressWarnings("rawtypes") - @Override - protected Map variables() { - if (variables == null) { - Map predVars = pred().variables(); - Map accumVars = accum().variables(); - variables = Collection.concat(predVars.exclude(accumVars::contains), accumVars.exclude(predVars::contains)).asMap(Function.identity()); - } - return variables; - } - - private int identityIndex = -1; - - @SuppressWarnings("rawtypes") - private int identityIndex() { - if (identityIndex < 0) { - TermImpl accum = accum(); - for (int i = 1; i < accum.length(); i++) { - if (accum.get(i) instanceof TermImpl) { - Class rt = ((VarImpl) accum.get(resultIndex())).type(); - Class at = ((TermImpl) accum.get(i)).type(); - if (rt.isAssignableFrom(at)) { - identityIndex = i; - break; - } - } - } - } - return identityIndex; - } - - private int resultIndex = -1; - - @SuppressWarnings("rawtypes") - private int resultIndex() { - if (resultIndex < 0) { - TermImpl accum = accum(); - for (int i = 1; i < accum.length(); i++) { - if (accum.get(i) instanceof VarImpl && !localVariables().containsKey((VarImpl) accum.get(i))) { - resultIndex = i; - break; - } - } - } - return resultIndex; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - protected Collection match(TermImpl goal, List der, Map> rec, Database database) { - Map localVars = ((CollectImpl) goal).localVariables(); - int ii = ((CollectImpl) goal).identityIndex(); - int ri = ((CollectImpl) goal).resultIndex(); - TermImpl goalPred = ((CollectImpl) goal).pred(); - TermImpl goalAccum = ((CollectImpl) goal).accum(); - TermImpl accum = accum(); - Set rs = Set.of(accum.getTerm(ii)); - Set inc = Set.of(); - for (TermImpl pm : ((TermImpl) pred().setBinding(localVars)).match(goalPred, der, rec, database)) { - if (pm.isIncomplete()) { - inc = inc.add(pm); - } else { - Map b = goalPred.getBinding(pm, Map.of()); - Set a = Set.of(); - for (TermImpl r : rs) { - TermImpl s = accum.setBinding(b).set(ii, r); - for (TermImpl am : ((TermImpl) s).match(goalAccum, der, rec, database)) { - if (am.isIncomplete()) { - inc = inc.add(am); - } else { - a = a.add(am); - } - } - } - rs = a.map(t -> t.getTerm(ri)).asSet(); - } - } - return Collection.concat(inc, rs.map(t -> set(2, accum.set(ri, t)))); - } - - @SuppressWarnings("rawtypes") - @Override - protected int termPrio(TermImpl goal, List der, Map> rec, Database database) { - return super.termPrio(goal, der, rec, database); - } - - @SuppressWarnings("rawtypes") - @Override - protected Map getBinding(TermImpl term, Map vars) { - Map localVars = localVariables(); - return super.getBinding(term, vars).exclude(e -> localVars.containsKey(e.getKey())).asMap(Function.identity()); - } - } - - // Rules - - public static interface Rule extends Term { - } - - private static final FunctImpl RULE_FUNCTOR = functImpl((SerializableBiFunction) Logic::rule, null); - private static final Functor RULE_FUNCTOR_PROXY = RULE_FUNCTOR.proxy(); - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Rule rule(Pred pred, Goal goal) { - RuleImpl ruleImpl = new RuleImpl(pred, goal); - TermImpl termImpl = Logic. unproxy(pred); - FunctImpl functor = termImpl.functor(); - Database database = DATABASE.get(); - database.rules.updateAndGet(m -> m.put(functor, ADD_RULE.apply(m.get(functor), ruleImpl))); - return ruleImpl.proxy(); - } - - private static final class RuleImpl extends TermImpl { - private static final long serialVersionUID = -4602043866952049391L; - - private RuleImpl(Term term, Goal goal) { - super(RULE_FUNCTOR_PROXY, term, goal); - } - - @SuppressWarnings("rawtypes") - private RuleImpl(TermImpl term, GoalImpl goal) { - super(RULE_FUNCTOR, term, goal); - } - - private RuleImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings("unchecked") - protected final Rule proxy() { - return (Rule) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Rule.class}, this); - } - - @SuppressWarnings("rawtypes") - protected final TermImpl term() { - return ((TermImpl) get(1)); - } - - @SuppressWarnings("rawtypes") - protected final GoalImpl goal() { - return ((GoalImpl) get(2)); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - protected Set eval(TermImpl term, List der, Map> rec, Database database) { - TermImpl head = term(); - Map binding = head.getBinding(term, Map.of()); - if (binding == null) { - return Set.of(); - } - if (TRACE_LOGIC) { - System.err.println("!!!!!!!!!!!!!! " + " ".repeat(der.size()) + this + " " + binding.toString().substring(3)); - } - Collection> r = goal().eval(variables().putAll(binding), der, rec, database); - return r.map(m -> { - TermImpl it = (TermImpl) m.get(INCOMPLETE_VAR); - return it != null ? it : head.setBinding(m); - }).asSet(); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - protected RuleImpl term(Object[] array) { - return new RuleImpl(array); - } - - protected int rulePrio() { - return goal().goals().size(); - } - } - - // Goals - - public static interface Goal extends Term { - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static final FunctImpl GOAL_FUNCTOR = functImpl((SerializableFunction) Logic::goal, null); - private static final Functor GOAL_FUNCTOR_PROXY = GOAL_FUNCTOR.proxy(); - - private static GoalImpl getImpl(Goal goal) { - return Logic. unproxy(goal); - } - - public static boolean isTrue(Goal goal) { - return getImpl(goal).eval().anyMatch(e -> !e.containsKey(INCOMPLETE_VAR)); - } - - public static boolean isFalse(Goal goal) { - return getImpl(goal).eval().isEmpty(); - } - - public static boolean isIncomplete(Goal goal) { - return getImpl(goal).eval().anyMatch(e -> e.containsKey(INCOMPLETE_VAR)); - } - - @SuppressWarnings("rawtypes") - public static Set> getBindings(Goal goal) { - return getImpl(goal).eval().map(m -> m.asMap(e -> Entry.of((Variable) e.getKey().proxy(), proxy(e.getValue())))).asSet(); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Goal goal(Pred... goals) { - return new GoalImpl(list(goals)).proxy(); - } - - @SuppressWarnings("unchecked") - public static Goal goal(L goals) { - return new GoalImpl(goals).proxy(); - } - - private static final class GoalImpl extends TermImpl { - private static final long serialVersionUID = -4100263206389367132L; - - private GoalImpl(L goals) { - super(GOAL_FUNCTOR_PROXY, goals); - } - - @SuppressWarnings("rawtypes") - private GoalImpl(TermImpl goals) { - super(GOAL_FUNCTOR, goals); - } - - private GoalImpl(Object[] args) { - super(args); - } - - @Override - @SuppressWarnings("unchecked") - protected final Goal proxy() { - return (Goal) Proxy.newProxyInstance(type().getClassLoader(), new Class[]{Goal.class}, this); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - protected GoalImpl term(Object[] array) { - return new GoalImpl(array); - } - - @SuppressWarnings("rawtypes") - public Collection> eval() { - return eval(variables(), List.of(), Map.of(), DATABASE.get()); - } - - @SuppressWarnings("rawtypes") - protected Collection> eval(Map vars, List der, Map> rec, Database database) { - return eval(goals(), Set.of(vars), der, rec, database); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - protected List goals() { - return ((TermImpl) get(1)).list(); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - private Collection> eval(List goals, Collection> vars, List der, Map> rec, Database database) { - if (goals.isEmpty()) { - return vars; - } - return vars.> flatMap(v -> { - if (v.containsKey(INCOMPLETE_VAR)) { - return Set.of(v); - } - List actual = List.of(); - for (TermImpl g : goals) { - actual = actual.add(g.setBinding(v)); - } - int i = first(actual, goals, der, rec, database); - TermImpl f = actual.get(i); - TermImpl g = goals.get(i); - Collection m = f.match(g, der, rec, database); - return eval(goals.removeIndex(i), m.> map(t -> { - if (t.type() == Incomplete.class) { - return Map.of(Entry.of(INCOMPLETE_VAR, t)); - } else { - Map b = g.getBinding(t, Map.of()); - return b == null ? Map.of() : v.putAll(b); - } - }), der, rec, database); - }); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - private static int first(List actual, List goals, List der, Map> rec, Database database) { - int first = -1; - int min = Integer.MAX_VALUE; - for (int i = 0; i < actual.size(); i++) { - int prio = actual.get(i).termPrio(goals.get(i), der, rec, database); - if (first == -1 || prio < min) { - first = i; - min = prio; - } - } - return first; - } - } - - // Incomplete - - public interface Incomplete extends Term { - } - - @SuppressWarnings("rawtypes") - private static final FunctImpl INCOMPLETE_FUNCTOR = functImpl((SerializableFunction) Logic::incomplete, null); - private static final Functor INCOMPLETE_FUNCTOR_PROXY = INCOMPLETE_FUNCTOR.proxy(); - private static final VarImpl INCOMPLETE_VAR = new VarImpl(Incomplete.class, "I"); - private static final Incomplete INCOMPLETE_VAR_PROXY = INCOMPLETE_VAR.proxy(); - - @SuppressWarnings("unchecked") - public static Incomplete incompleteVar() { - return INCOMPLETE_VAR_PROXY; - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static TermImpl incomplete(List der) { - return incomplete(list(der)); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static TermImpl incomplete(TermImpl der) { - return termImpl(INCOMPLETE_FUNCTOR, der); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static Incomplete incomplete(L der) { - return term(INCOMPLETE_FUNCTOR_PROXY, der); - } - - // Equals - - @SuppressWarnings({"unchecked", "rawtypes"}) - private static Functor eq = functor(Logic::eq, t -> { - TermImpl at = t.getTerm(1); - TermImpl bt = t.getTerm(2); - if (at == null && bt == null) { - return t.incomplete(); - } else if (at == null) { - return Set.of(t.set(1, bt)); - } else if (bt == null) { - return Set.of(t.set(2, at)); - } else { - TermImpl eq = at.eq(bt); - return eq == null ? Set.of() : Set.of(t.set(1, eq).set(2, eq)); - } - }); - - public static Pred eq(Term a, Term b) { - return term(eq, a, b); - } - - // Facts - - @SuppressWarnings({"unchecked", "rawtypes"}) - public static void fact(Rel rel) { - Logic. unproxy(rel).makeFact(DATABASE.get()); - } - - // Is - - public static interface Atom extends Term { - - } - - public static interface Func extends Term { - - } - - @SuppressWarnings("rawtypes") - private static Functor is = functor((SerializableBiFunction) Logic::is); - - public static Pred is(T a, T b) { - return term(is, a, b); - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - public static void isRules() { - Atom A1 = var(Atom.class, "A1"); - Atom A2 = var(Atom.class, "A2"); - Func F1 = var(Func.class, "F1"); - Func F2 = var(Func.class, "F2"); - - rule(is(A1, A2), goal(eq(A1, A2))); - rule(is(F1, F2), goal(is(F2, A2), is(F1, A2))); - rule(is(A1, F1), goal(is(F1, A1))); - } - - // Bindings - - public static Map incomplete(Term... der) { - return Map.of(Entry.of((Variable) incompleteVar(), incomplete(list(der)).proxy())); - } - - public static Map binding(Term... varVal) { - Map b = Map.of(); - for (int i = 0; i < varVal.length; i += 2) { - b = b.add(Entry.of((Variable) varVal[i], varVal[i + 1])); - } - return b; - } - -} From 03c63a1bb0865e9110eb1b77c3159a7a4c329820 Mon Sep 17 00:00:00 2001 From: automation Date: Sun, 5 Jan 2025 13:45:06 +0000 Subject: [PATCH 145/179] [no-ci] updated by mvgplugin --- .github/dependabot.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 +- settings.gradle.kts | 2 +- .../org/modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Action.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Constant.java | 2 +- src/main/java/org/modelingvalue/dclare/ConstantState.java | 2 +- src/main/java/org/modelingvalue/dclare/Construction.java | 2 +- src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareConfig.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/Derivation.java | 2 +- .../java/org/modelingvalue/dclare/DerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Direction.java | 2 +- src/main/java/org/modelingvalue/dclare/Feature.java | 2 +- src/main/java/org/modelingvalue/dclare/FeatureModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/FixpointGroup.java | 2 +- src/main/java/org/modelingvalue/dclare/Getable.java | 2 +- src/main/java/org/modelingvalue/dclare/ILeafTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/IState.java | 2 +- src/main/java/org/modelingvalue/dclare/IdentityDerivation.java | 2 +- .../org/modelingvalue/dclare/IdentityDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Imperative.java | 2 +- .../java/org/modelingvalue/dclare/ImperativeTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/JsonToState.java | 2 +- src/main/java/org/modelingvalue/dclare/LazyDerivation.java | 2 +- .../org/modelingvalue/dclare/LazyDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Leaf.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/MatchInfo.java | 2 +- src/main/java/org/modelingvalue/dclare/Mutable.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableClass.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableState.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Newable.java | 2 +- src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java | 2 +- .../java/org/modelingvalue/dclare/NonInternableObserver.java | 2 +- src/main/java/org/modelingvalue/dclare/Observed.java | 2 +- src/main/java/org/modelingvalue/dclare/ObservedInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/Observer.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/OneShot.java | 2 +- src/main/java/org/modelingvalue/dclare/Priority.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnly.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ReusableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Setable.java | 2 +- src/main/java/org/modelingvalue/dclare/SetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/State.java | 2 +- src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMap.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMergeHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateToJson.java | 2 +- src/main/java/org/modelingvalue/dclare/This.java | 2 +- src/main/java/org/modelingvalue/dclare/Transaction.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionClass.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionId.java | 2 +- src/main/java/org/modelingvalue/dclare/TypeWrapper.java | 2 +- src/main/java/org/modelingvalue/dclare/Universe.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseStatistics.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java | 2 +- .../modelingvalue/dclare/ex/CycleInParentChainException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java | 2 +- .../org/modelingvalue/dclare/ex/EmptyMandatoryException.java | 2 +- .../modelingvalue/dclare/ex/NoCurrentTransactionException.java | 2 +- .../org/modelingvalue/dclare/ex/NonDeterministicException.java | 2 +- .../org/modelingvalue/dclare/ex/NotYetDerivableException.java | 2 +- .../java/org/modelingvalue/dclare/ex/OutOfScopeException.java | 2 +- .../org/modelingvalue/dclare/ex/ReferencedOrphanException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyChangesException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObservedException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObserversException.java | 2 +- .../java/org/modelingvalue/dclare/ex/TransactionException.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Converters.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/JsonIC.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerialisationPool.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerializationHelper.java | 2 +- .../modelingvalue/dclare/sync/SerializationHelperWithPool.java | 2 +- .../org/modelingvalue/dclare/sync/SocketSyncConnection.java | 2 +- .../java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java | 2 +- .../org/modelingvalue/dclare/sync/SyncConnectionHandler.java | 2 +- .../org/modelingvalue/dclare/sync/UniverseSynchronizer.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Util.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java | 2 +- .../java/org/modelingvalue/dclare/test/CommunicationTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/DclareTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/JsonICTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/NewableTests.java | 2 +- .../org/modelingvalue/dclare/test/SerialisationPoolTests.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationHelper.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationPeer.java | 2 +- .../java/org/modelingvalue/dclare/test/support/Fibonacci.java | 2 +- .../java/org/modelingvalue/dclare/test/support/ModelMaker.java | 2 +- .../org/modelingvalue/dclare/test/support/OneShotTests.java | 2 +- .../java/org/modelingvalue/dclare/test/support/PeerTester.java | 2 +- src/test/java/org/modelingvalue/dclare/test/support/Shared.java | 2 +- .../org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestMutable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestMutableClass.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestNewable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestNewableClass.java | 2 +- .../org/modelingvalue/dclare/test/support/TestObserved.java | 2 +- .../org/modelingvalue/dclare/test/support/TestScheduler.java | 2 +- .../org/modelingvalue/dclare/test/support/TestUniverse.java | 2 +- 113 files changed, 113 insertions(+), 113 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ea7e9c02..49c8a9f2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/build.gradle.kts b/build.gradle.kts index 02f98aa6..0ea5e6d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/gradle.properties b/gradle.properties index 56b71b4d..e9e5f23f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/settings.gradle.kts b/settings.gradle.kts index eb29d1af..f521fe01 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 0ebf60e1..25c44842 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index c19f2e12..5cda0fd5 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionInstance.java b/src/main/java/org/modelingvalue/dclare/ActionInstance.java index 293c4150..c1c8573f 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ActionInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 56a8b4dd..e5ef4070 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 31ef100e..0ff59da6 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index ea9e9cca..8753d506 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Construction.java b/src/main/java/org/modelingvalue/dclare/Construction.java index eaad3d90..2fc5593c 100644 --- a/src/main/java/org/modelingvalue/dclare/Construction.java +++ b/src/main/java/org/modelingvalue/dclare/Construction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java index f5f65e53..37f99f26 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java index a7550995..136b5c73 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareConfig.java b/src/main/java/org/modelingvalue/dclare/DclareConfig.java index 5d741b29..b835ca90 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareConfig.java +++ b/src/main/java/org/modelingvalue/dclare/DclareConfig.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareTrace.java b/src/main/java/org/modelingvalue/dclare/DclareTrace.java index b126c564..a5ccce29 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareTrace.java +++ b/src/main/java/org/modelingvalue/dclare/DclareTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Derivation.java b/src/main/java/org/modelingvalue/dclare/Derivation.java index d58aaa65..42ad1cf7 100644 --- a/src/main/java/org/modelingvalue/dclare/Derivation.java +++ b/src/main/java/org/modelingvalue/dclare/Derivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java index 006ec7ae..75517cf5 100644 --- a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Direction.java b/src/main/java/org/modelingvalue/dclare/Direction.java index 91e1ad60..21645f10 100644 --- a/src/main/java/org/modelingvalue/dclare/Direction.java +++ b/src/main/java/org/modelingvalue/dclare/Direction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Feature.java b/src/main/java/org/modelingvalue/dclare/Feature.java index a4bb3ebf..0726a141 100644 --- a/src/main/java/org/modelingvalue/dclare/Feature.java +++ b/src/main/java/org/modelingvalue/dclare/Feature.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java index d0c8a2f3..67ab196f 100644 --- a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java +++ b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java index 81e707d0..f3b7a3c2 100644 --- a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Getable.java b/src/main/java/org/modelingvalue/dclare/Getable.java index 9aa4a622..eeb145e4 100644 --- a/src/main/java/org/modelingvalue/dclare/Getable.java +++ b/src/main/java/org/modelingvalue/dclare/Getable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java index afe7dee4..dd20f832 100644 --- a/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IState.java b/src/main/java/org/modelingvalue/dclare/IState.java index 61e85971..5d8d02fe 100644 --- a/src/main/java/org/modelingvalue/dclare/IState.java +++ b/src/main/java/org/modelingvalue/dclare/IState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java index 301b6755..75d36a65 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 3e94e2a7..6bb6cfee 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Imperative.java b/src/main/java/org/modelingvalue/dclare/Imperative.java index 34bd3c3b..1f8aba2a 100644 --- a/src/main/java/org/modelingvalue/dclare/Imperative.java +++ b/src/main/java/org/modelingvalue/dclare/Imperative.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index ad17dc39..321bfea7 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/JsonToState.java b/src/main/java/org/modelingvalue/dclare/JsonToState.java index d5c7c456..3d1cab4e 100644 --- a/src/main/java/org/modelingvalue/dclare/JsonToState.java +++ b/src/main/java/org/modelingvalue/dclare/JsonToState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java index 374d621a..43e5e09b 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index c7998163..76092b2d 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 6824c1a8..7ad05b3d 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafModifier.java b/src/main/java/org/modelingvalue/dclare/LeafModifier.java index 64ee7e13..af32abef 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/LeafModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index 4bb97445..20345164 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 905c1e59..3ce34283 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index ea1115d7..79c54bd1 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableClass.java b/src/main/java/org/modelingvalue/dclare/MutableClass.java index 79419600..2c021d96 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableClass.java +++ b/src/main/java/org/modelingvalue/dclare/MutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index 7a278a66..d28bb0c2 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index 086b73ae..cf6ed5ec 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Newable.java b/src/main/java/org/modelingvalue/dclare/Newable.java index c1a2ad08..fd689459 100644 --- a/src/main/java/org/modelingvalue/dclare/Newable.java +++ b/src/main/java/org/modelingvalue/dclare/Newable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 06f5b2cd..4c37f0a4 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java index 820d8fcc..a369194f 100644 --- a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index e6c11ea4..6d697fb5 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java index a9785839..b1752374 100644 --- a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index a1dee466..b55004f1 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 6c2eb57c..57845284 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 6a10fb2c..4d7e1d28 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 38a220fb..8bf20d7d 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Priority.java b/src/main/java/org/modelingvalue/dclare/Priority.java index 494c6f2b..9611bb33 100644 --- a/src/main/java/org/modelingvalue/dclare/Priority.java +++ b/src/main/java/org/modelingvalue/dclare/Priority.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnly.java b/src/main/java/org/modelingvalue/dclare/ReadOnly.java index 3f0a17b2..55bf3c79 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnly.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnly.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 65d6c802..4776c5fb 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java index 83835dbf..6a216e7b 100644 --- a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index 20a1d6e3..1e821f85 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/SetableModifier.java b/src/main/java/org/modelingvalue/dclare/SetableModifier.java index 7a37b47e..eb0181c7 100644 --- a/src/main/java/org/modelingvalue/dclare/SetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/SetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index edf79c27..3c779edd 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java index aa1a7982..85df0428 100644 --- a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMap.java b/src/main/java/org/modelingvalue/dclare/StateMap.java index c3a10042..3cd09040 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMap.java +++ b/src/main/java/org/modelingvalue/dclare/StateMap.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java index dbdae609..1791e3ac 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index b9894234..847a967d 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/This.java b/src/main/java/org/modelingvalue/dclare/This.java index c7ba7141..24914670 100644 --- a/src/main/java/org/modelingvalue/dclare/This.java +++ b/src/main/java/org/modelingvalue/dclare/This.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Transaction.java b/src/main/java/org/modelingvalue/dclare/Transaction.java index 68bb2525..3f4af914 100644 --- a/src/main/java/org/modelingvalue/dclare/Transaction.java +++ b/src/main/java/org/modelingvalue/dclare/Transaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionClass.java b/src/main/java/org/modelingvalue/dclare/TransactionClass.java index ebe6453a..4562ff8e 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionClass.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionId.java b/src/main/java/org/modelingvalue/dclare/TransactionId.java index 7f70acf5..edbd07ed 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionId.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionId.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java index 2a344061..90624f8e 100644 --- a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java +++ b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index 815852d4..e8badb9d 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java index 7f10f98e..b413c996 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 75de340a..013dc1aa 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java index 06db1e62..1719b0b7 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java index 8946f850..017f0b52 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java index 24c94828..8c5aff09 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java index c2da64c4..673760f0 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java index 55304501..fa49dfcb 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java index 640cd8e1..6d278c9b 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java index c77f1097..44269a1b 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java index 00c234b5..9b290779 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java index 81e83df3..bf93cf0c 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java index d999e1e7..2e471c4a 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java index a7f86b8a..0543262d 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java index 8f3a8891..d8f99a1f 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java index 300f3684..46714b68 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java index 9312f5d0..aca1754c 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Converters.java b/src/main/java/org/modelingvalue/dclare/sync/Converters.java index 40126939..cf086944 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Converters.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Converters.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index e6a0d18d..4ae64aed 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java index 850c846c..e4eb970b 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java +++ b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java index 3bc58659..5662518a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java index 4824d3e2..806722b8 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java index 51d88799..1070086c 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java index cbc55e8a..95031fd0 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java index 5bb854c9..4a2790ff 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java index e6708865..addc9518 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java index 775b7b55..902ea775 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Util.java b/src/main/java/org/modelingvalue/dclare/sync/Util.java index 86d8c59a..d0801c38 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Util.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Util.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java index e19ce203..2020d963 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java +++ b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java index 209b68b3..e6533a8a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java index c66b7209..eba08ded 100644 --- a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java index ff314448..a2effcab 100644 --- a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index 520f44b0..71347ed4 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java index e0fee763..9a4f8dcb 100644 --- a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java index 9407541b..6d2e21dd 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java index af963b01..3747156f 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java index 8c6812a8..6461d29e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index 3cbb5f2d..cfe55cf2 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java index d1f801c9..990c6ec5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java index f828e143..a8ee8e95 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java index d2361a59..9128f2be 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java index af432bf7..74286a9f 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java index 36d6340a..dc11848b 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java index b9f25ed5..c29f7c59 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java index 1036a401..9898a970 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java index a655b961..f4136d54 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java index eb9dcce1..dd7fd436 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java index e6a7f026..d6f3dfe4 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java index d61d8f36..079329ba 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2024 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ From 206baf7cc6941e6864b53f29bf6502b52e7253ff Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 23 Jan 2025 14:29:37 +0100 Subject: [PATCH 146/179] NULL -> null --- src/main/java/org/modelingvalue/dclare/ConstantState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 8753d506..10fe9875 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -177,7 +177,7 @@ public V getOrSet(ILeafTransaction cch, O object, Constant constant, V if (ist == null) { ist = set(cch, object, constant, prev, soll == null ? (V) NULL : soll, false); } - return ist; + return ist == NULL ? null : ist; } @SuppressWarnings("unchecked") From 73b81eb93bf250df055a68476c7f986374d649c5 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 25 Feb 2025 11:22:07 +0100 Subject: [PATCH 147/179] pushNow --- .../java/org/modelingvalue/dclare/Mutable.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 79c54bd1..5f89b129 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -187,6 +187,23 @@ default void dDeactivate(LeafTransaction tx) { } } + @SuppressWarnings({"rawtypes", "unchecked"}) + default void pushNow() { + AbstractDerivationTransaction tx = (AbstractDerivationTransaction) LeafTransaction.getCurrent(); + try { + MutableClass dClass = dClass(); + Set containments = MutableClass.D_CONTAINMENTS.get(dClass); + Set children = containments.flatMap(s -> s. getCollection(this)).asSet(); + children.forEach(m -> m.pushNow()); + Set nonDerivers = MutableClass.D_NON_DERIVERS.get(dClass).filter(d -> d.direction().isLazy()).asSet(); + nonDerivers.forEach(o -> tx.runDeriver(this, null, o, 0)); + Set observeds = MutableClass.D_PUSH_IF_PULL.get(dClass); + observeds.forEach(o -> o.get(this)); + } catch (Throwable t) { + tx.universeTransaction().handleException(t); + } + } + MutableClass dClass(); @SuppressWarnings("rawtypes") From 879b76353bf236b63d8cb006be9169ef15ff929f Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 3 Mar 2025 14:29:23 +0100 Subject: [PATCH 148/179] ignore exceptions in IdentityDerivationTransaction --- .../dclare/AbstractDerivationTransaction.java | 7 ++++++- .../dclare/IdentityDerivationTransaction.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 25c44842..819f8093 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -160,12 +160,17 @@ protected void runDeriver(Mutable mutable, Observed observed, Observer observer, if (isTraceDerivation(mutable, observed)) { runSilent(() -> System.err.println(tracePre(mutable, this) + "!!!! " + mutable + "." + observer + "() => THROWS " + t)); } - universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); + handleException(mutable, observer, t); } })); } + @SuppressWarnings("rawtypes") + protected void handleException(Mutable mutable, Observer observer, Throwable t) { + universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); + } + @Override public T set(O object, Setable setable, BiFunction function, E element) { T nonDerived = getNonDerived(object, setable); diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 6bb6cfee..042f919a 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -84,6 +84,12 @@ protected boolean isTraceDerivation(O object, Setable setable) { return super.isTraceDerivation(object, setable) && (universeTransaction().getConfig().isTraceMatching() || memoization(object) != memoization()); } + @SuppressWarnings("rawtypes") + @Override + protected void handleException(Mutable mutable, Observer observer, Throwable t) { + // Ignore + } + @Override protected String getCurrentTypeForTrace() { return "ID"; From 7dcee856ea233d59188655a4dcc4a1f57067ee36 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 6 Mar 2025 16:05:50 +0100 Subject: [PATCH 149/179] defer exception handling when deriving identities --- .../modelingvalue/dclare/IdentityDerivationTransaction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 042f919a..4650ac5b 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -87,7 +87,9 @@ protected boolean isTraceDerivation(O object, Setable setable) { @SuppressWarnings("rawtypes") @Override protected void handleException(Mutable mutable, Observer observer, Throwable t) { - // Ignore + if (t instanceof RuntimeException) { + throw (RuntimeException) t; + } } @Override From ddc4d77f2c2114c54693a8277b9c7401f7b33d17 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 20 Mar 2025 14:20:55 +0100 Subject: [PATCH 150/179] reverse handling --- .../dclare/AbstractDerivationTransaction.java | 2 +- .../dclare/IdentityDerivationTransaction.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 819f8093..8b0b17f4 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -167,7 +167,7 @@ protected void runDeriver(Mutable mutable, Observed observed, Observer observer, } @SuppressWarnings("rawtypes") - protected void handleException(Mutable mutable, Observer observer, Throwable t) { + protected final void handleException(Mutable mutable, Observer observer, Throwable t) { universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); } diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 4650ac5b..6bb6cfee 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -84,14 +84,6 @@ protected boolean isTraceDerivation(O object, Setable setable) { return super.isTraceDerivation(object, setable) && (universeTransaction().getConfig().isTraceMatching() || memoization(object) != memoization()); } - @SuppressWarnings("rawtypes") - @Override - protected void handleException(Mutable mutable, Observer observer, Throwable t) { - if (t instanceof RuntimeException) { - throw (RuntimeException) t; - } - } - @Override protected String getCurrentTypeForTrace() { return "ID"; From 79215c492bc8cc6ab2d5a706d6b3d94104492514 Mon Sep 17 00:00:00 2001 From: WimBast Date: Mon, 24 Mar 2025 11:16:48 +0100 Subject: [PATCH 151/179] ignore exceptions in Identity derivation --- .../modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- .../modelingvalue/dclare/IdentityDerivationTransaction.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 8b0b17f4..819f8093 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -167,7 +167,7 @@ protected void runDeriver(Mutable mutable, Observed observed, Observer observer, } @SuppressWarnings("rawtypes") - protected final void handleException(Mutable mutable, Observer observer, Throwable t) { + protected void handleException(Mutable mutable, Observer observer, Throwable t) { universeTransaction().handleException(new TransactionException(mutable, new TransactionException(observer, t))); } diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index 6bb6cfee..b97913a2 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -88,4 +88,10 @@ protected boolean isTraceDerivation(O object, Setable setable) { protected String getCurrentTypeForTrace() { return "ID"; } + + @Override + @SuppressWarnings("rawtypes") + protected void handleException(Mutable mutable, Observer observer, Throwable t) { + // Ignore: Will result in missing matches in complex identity situations, hence, less incremental + } } From 7c45ad1ea13768ad0dab141cac72918107f7e012 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 27 Mar 2025 13:29:18 +0100 Subject: [PATCH 152/179] Atomic Derived --- .../dclare/AbstractDerivationTransaction.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 819f8093..46940f98 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -21,6 +21,7 @@ package org.modelingvalue.dclare; import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; import java.util.function.Supplier; import java.util.function.UnaryOperator; @@ -330,29 +331,31 @@ public int depth() { } protected static class Derived extends Pair> { - private static final long serialVersionUID = -2566539820227398813L; + private static final long serialVersionUID = -2566539820227398813L; @SuppressWarnings("rawtypes") - private final Derived outer; - private T value; + private final Derived outer; + private final AtomicReference value; @SuppressWarnings("rawtypes") protected Derived(O a, Observed b, Derived outer) { super(a, b); this.outer = outer; + this.value = new AtomicReference<>(); } protected T get() { + T value = this.value.get(); return value == ConstantState.NULL ? null : value; } @SuppressWarnings("unchecked") protected void set(T value) { - this.value = value == null ? (T) ConstantState.NULL : value; + this.value.set(value == null ? (T) ConstantState.NULL : value); } protected boolean isSet() { - return value != null; + return this.value.get() != null; } protected boolean isDerived(Object object, Observed observed) { From 0776b7fd5a6b43c53bb22d59ce85efdea87dfac2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 15 May 2025 09:56:44 +0200 Subject: [PATCH 153/179] not only lazy when pushNow on Mutable --- src/main/java/org/modelingvalue/dclare/Mutable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index 5f89b129..7092d857 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -195,7 +195,7 @@ default void pushNow() { Set containments = MutableClass.D_CONTAINMENTS.get(dClass); Set children = containments.flatMap(s -> s. getCollection(this)).asSet(); children.forEach(m -> m.pushNow()); - Set nonDerivers = MutableClass.D_NON_DERIVERS.get(dClass).filter(d -> d.direction().isLazy()).asSet(); + Set nonDerivers = MutableClass.D_NON_DERIVERS.get(dClass).asSet(); nonDerivers.forEach(o -> tx.runDeriver(this, null, o, 0)); Set observeds = MutableClass.D_PUSH_IF_PULL.get(dClass); observeds.forEach(o -> o.get(this)); From 4af77d6a0cc85fcd0e3db19d17d1e58ed6b04f55 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 15 May 2025 16:14:47 +0200 Subject: [PATCH 154/179] get Setable -> getRaw --- .../dclare/ActionTransaction.java | 6 +-- .../dclare/ImperativeTransaction.java | 4 +- .../org/modelingvalue/dclare/Mutable.java | 6 +-- .../modelingvalue/dclare/MutableState.java | 2 +- .../dclare/MutableTransaction.java | 2 +- .../dclare/ObserverTransaction.java | 2 +- .../org/modelingvalue/dclare/Setable.java | 2 +- .../java/org/modelingvalue/dclare/State.java | 2 +- .../org/modelingvalue/dclare/StateMap.java | 5 --- .../org/modelingvalue/dclare/StateToJson.java | 44 +++++++++---------- .../dclare/UniverseTransaction.java | 2 +- .../dclare/test/DclareTests.java | 34 +++++++------- .../dclare/test/support/ModelMaker.java | 20 ++++----- 13 files changed, 61 insertions(+), 70 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index e5ef4070..5af2f54c 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -158,18 +158,18 @@ protected void rollback() { @Override public T set(O object, Setable property, BiFunction function, E element) { - return set(object, property, function.apply(currentState.get().get(object, property), element)); + return set(object, property, function.apply(currentState.get().getRaw(object, property), element)); } @Override public T set(O object, Setable property, UnaryOperator oper) { - return set(object, property, oper.apply(currentState.get().get(object, property))); + return set(object, property, oper.apply(currentState.get().getRaw(object, property))); } @Override public T set(O object, Setable property, T post) { property.init(post); - T pre = state().get(object, property); + T pre = state().getRaw(object, property); set(object, property, pre, post); return pre; } diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 321bfea7..9ad05ef9 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -117,7 +117,7 @@ public MutableState mutableState() { public final boolean commit(State dclare, boolean timeTraveling) { commiting = true; - boolean insync = setted.isEmpty() && dclare.get(this, CHANGE_NR).equals(state.get(this, CHANGE_NR)); + boolean insync = setted.isEmpty() && dclare.getRaw(this, CHANGE_NR).equals(state.getRaw(this, CHANGE_NR)); if (preState() != dclare) { dclare2imper(dclare, timeTraveling, insync); } @@ -185,7 +185,7 @@ private Action changeAction(State imper, DefaultMap dAllDerivations() { default boolean dBecameOrphan() { LeafTransaction tx = LeafTransaction.getCurrent(); return tx.preStartState(Priority.OUTER).getRaw(this, Mutable.D_PARENT_CONTAINING) != null && // - tx.state().get(this, Mutable.D_PARENT_CONTAINING) == null; + tx.state().getRaw(this, Mutable.D_PARENT_CONTAINING) == null; } default void dChangedParentContaining(Pair> pre, Pair> post) { @@ -242,7 +242,7 @@ default MutableTransaction newTransaction(UniverseTransaction universeTransactio @Override default State run(State state, MutableTransaction parent) { - Pair> pair = state.get(this, D_PARENT_CONTAINING); + Pair> pair = state.getRaw(this, D_PARENT_CONTAINING); if (pair != null && parent.mutable().equals(pair.a())) { return TransactionClass.super.run(state, parent); } else { @@ -266,7 +266,7 @@ default boolean dCheckConsistency() { } default boolean dIsOrphan(State state) { - return state.get(this, D_PARENT_CONTAINING) == null; + return state.getRaw(this, D_PARENT_CONTAINING) == null; } default ConstantState dMemoization(AbstractDerivationTransaction tx) { diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index d28bb0c2..74f3409f 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -136,7 +136,7 @@ private State setChanged(State state, Mutable changed) { } private State setChanged(State state, Mutable changed, TransactionId txid) { - while (changed != null && !(changed instanceof Universe) && state.get(changed, Mutable.D_CHANGE_ID) != txid) { + while (changed != null && !(changed instanceof Universe) && state.getRaw(changed, Mutable.D_CHANGE_ID) != txid) { state = state.set(changed, Mutable.D_CHANGE_ID, txid); changed = state.getA(changed, Mutable.D_PARENT_CONTAINING); } diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index cf6ed5ec..4579064a 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -64,7 +64,7 @@ public final Mutable mutable() { } protected boolean hasQueued(State state, Mutable object, Priority prio) { - return !state.get(object, state.actions(prio)).isEmpty() || !state.get(object, state.children(prio)).isEmpty(); + return !state.getRaw(object, state.actions(prio)).isEmpty() || !state.getRaw(object, state.children(prio)).isEmpty(); } private void move(Mutable object, Priority from, Priority to) { diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 4d7e1d28..c329dcfa 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -229,7 +229,7 @@ private ObserverTrace trace(State pre, DefaultMap> observ ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), nrOfChanges, // observeds.filter(e -> !e.getKey().isPlumbing()).flatMap(e -> e.getValue().map(m -> { m = m.dResolve(mutable()); - return Entry.of(ObservedInstance.of(m, e.getKey()), pre.get(m, e.getKey())); + return Entry.of(ObservedInstance.of(m, e.getKey()), pre.getRaw(m, e.getKey())); })).asMap(e -> e), // pre.diff(current(), o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).// flatMap(e1 -> e1.getValue().map(e2 -> Entry.of(ObservedInstance.of((Mutable) e1.getKey(), (Observed) e2.getKey()), e2.getValue().b()))).asMap(e -> e)); diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index 1e821f85..8ccc05bf 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -375,7 +375,7 @@ public Set checkConsistency(State state, O object, T post) { } } if (scope != null) { - Set s = state.get(object, scope.get()); + Set s = state.getRaw(object, scope.get()); if (post instanceof ContainingCollection) { if (!s.containsAll((ContainingCollection) post)) { errors = errors.add(new OutOfScopeException(object, this, post, s)); diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 3c779edd..6a8e5c30 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -397,7 +397,7 @@ public UniverseTransaction universeTransaction() { @Override public TransactionId transactionId() { - return get(universeTransaction.universe(), Mutable.D_CHANGE_ID); + return getRaw(universeTransaction.universe(), Mutable.D_CHANGE_ID); } @Override diff --git a/src/main/java/org/modelingvalue/dclare/StateMap.java b/src/main/java/org/modelingvalue/dclare/StateMap.java index 3cd09040..363403fa 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMap.java +++ b/src/main/java/org/modelingvalue/dclare/StateMap.java @@ -146,11 +146,6 @@ public String toString() { }).collect(Collectors.joining("\n")); } - @SuppressWarnings("unchecked") - public T get(O obj, Setable settable) { - return (T) map.get(obj).get(settable); - } - public StateMap clear(O obj, Setable settable) { return new StateMap(map.put(obj, map.get(obj).removeKey(settable))); } diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index 847a967d..a7cdaf4a 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -36,9 +36,9 @@ @SuppressWarnings({"rawtypes", "unused"}) public class StateToJson extends ToJson { - public static final String ID_FIELD_NAME = "@id"; - public static final String ID_REF_FIELD_NAME = "@idref"; - public static final String NAME_FIELD_NAME = "name"; + public static final String ID_FIELD_NAME = "@id"; + public static final String ID_REF_FIELD_NAME = "@idref"; + public static final String NAME_FIELD_NAME = "name"; private static final Comparator> FIELD_SORTER = ((Comparator>) (e1, e2) -> isNameOrId(e1) ? -1 : isNameOrId(e2) ? +1 : 0).thenComparing(e -> e.getKey().toString()); private static boolean isNameOrId(Entry e) { @@ -98,31 +98,27 @@ protected Iterator> getMapIterator(Object o) { protected Map getMapIterator_Mutable(Mutable mutable) { Predicate setableFilter = getSetableFilter(); - return mutable.dClass() - .dSetables() // - .map((Setable setable) -> { - if (!setableFilter.test(setable)) { - return null; - } - @SuppressWarnings("unchecked") - Object value = state.get(mutable, setable); - @SuppressWarnings("unchecked") - Object defValue = setable.getDefault(mutable); - if (Objects.equals(value, defValue)) { - return null; - } - return org.modelingvalue.collections.Entry.of((Object) renderTag(setable), renderValue(mutable, setable, value)); - }) // - .filter(Objects::nonNull) // - .asMap(e -> e) - .toMutable(); + return mutable.dClass().dSetables() // + .map((Setable setable) -> { + if (!setableFilter.test(setable)) { + return null; + } + @SuppressWarnings("unchecked") + Object value = state.getRaw(mutable, setable); + @SuppressWarnings("unchecked") + Object defValue = setable.getDefault(mutable); + if (Objects.equals(value, defValue)) { + return null; + } + return org.modelingvalue.collections.Entry.of((Object) renderTag(setable), renderValue(mutable, setable, value)); + }) // + .filter(Objects::nonNull) // + .asMap(e -> e).toMutable(); } @SuppressWarnings("unchecked") protected Map getMapIterator_QualifiedSet(QualifiedSet qualifiedSet) { - return qualifiedSet.toKeys() - .asMap(k -> org.modelingvalue.collections.Entry.of(k, qualifiedSet.get(k))) - .toMutable(); + return qualifiedSet.toKeys().asMap(k -> org.modelingvalue.collections.Entry.of(k, qualifiedSet.get(k))).toMutable(); } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 013dc1aa..c6639518 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -643,7 +643,7 @@ protected void clearOrphans(Universe universe) { } public boolean isStopped(State state) { - return state.get(universe(), STOPPED); + return state.getRaw(universe(), STOPPED); } public void put(Object id, Runnable action) { diff --git a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java index eba08ded..0b270e38 100644 --- a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java @@ -77,8 +77,8 @@ public void source2target() { State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); printState(universeTransaction, result); - assertEquals(10, (int) result.get(object, source)); - assertEquals(10, (int) result.get(object, target)); + assertEquals(10, (int) result.getRaw(object, source)); + assertEquals(10, (int) result.getRaw(object, target)); } @RepeatedTest(32) @@ -96,8 +96,8 @@ public void simpleBiDirectional() { State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); printState(universeTransaction, result); - assertEquals(10, (int) result.get(object, source)); - assertEquals(10, (int) result.get(object, target)); + assertEquals(10, (int) result.getRaw(object, source)); + assertEquals(10, (int) result.getRaw(object, target)); } @Test @@ -126,7 +126,7 @@ public void derivationChain() { State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); printState(universeTransaction, result); - assertEquals(length, (int) result.get(TestMutable.of(length - 1, clazz), total)); + assertEquals(length, (int) result.getRaw(TestMutable.of(length - 1, clazz), total)); } static final Observed next = Observed.of("next", null, () -> DclareTests.previous); @@ -156,7 +156,7 @@ public void opposites() { universeTransaction.stop(); State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); - assertEquals(TestMutable.of(11, clazz), result.get(TestMutable.of(10, clazz), next)); + assertEquals(TestMutable.of(11, clazz), result.getRaw(TestMutable.of(10, clazz), next)); printState(universeTransaction, result); } @@ -199,9 +199,9 @@ public void moveAndRemove() { State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); printState(universeTransaction, result); - assertEquals(Set.of(), result.get(c1, children)); - assertNull(result.get(ggc6, qualifiedName)); - assertEquals("u.c2.gc2.ggc3", result.get(ggc3, qualifiedName)); + assertEquals(Set.of(), result.getRaw(c1, children)); + assertNull(result.getRaw(ggc6, qualifiedName)); + assertEquals("u.c2.gc2.ggc3", result.getRaw(ggc3, qualifiedName)); } @Test @@ -270,15 +270,15 @@ public void moodTest() { state = universeTransaction.waitForIdle(); printState(universeTransaction, state); - assertNull(state.get(universe, child)); + assertNull(state.getRaw(universe, child)); state = universeTransaction.putAndWaitForIdle("inject1", () -> child.set(universe, child1)); printState(universeTransaction, state); - assertEquals(child1, state.get(universe, child)); + assertEquals(child1, state.getRaw(universe, child)); state = universeTransaction.putAndWaitForIdle("inject2", () -> child.set(universe, child2)); printState(universeTransaction, state); - assertEquals(child2, state.get(universe, child)); + assertEquals(child2, state.getRaw(universe, child)); universeTransaction.stop(); state = universeTransaction.waitForStopped(); @@ -339,13 +339,13 @@ public void rippleOutTest() { State result = assertDoesNotThrow(() -> universe.waitForEnd(universeTransaction)); printState(universeTransaction, result); - List before = result.get(universe, begin); - List after = result.get(universe, end); - List list = result.get(universe, children); + List before = result.getRaw(universe, begin); + List after = result.getRaw(universe, end); + List list = result.getRaw(universe, children); assertEquals(List.of(one, two), list); assertEquals(List.of(one), before); assertEquals(List.of(two), after); - assertEquals(false, result.get(one, property)); - assertEquals(true, result.get(two, property)); + assertEquals(false, result.getRaw(one, property)); + assertEquals(true, result.getRaw(two, property)); } } diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index cfe55cf2..232899c7 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -253,42 +253,42 @@ public void setXyzzy_source(int i) { } public int getXyzzy_source() { - return tx.currentState().get(xyzzy, source); + return tx.currentState().getRaw(xyzzy, source); } public int getXyzzy_target() { - return tx.currentState().get(xyzzy, target); + return tx.currentState().getRaw(xyzzy, target); } public int getXyzzy_target2() { - return tx.currentState().get(xyzzy, target2); + return tx.currentState().getRaw(xyzzy, target2); } public List getXyzzy_aList() { - return tx.currentState().get(xyzzy, aList); + return tx.currentState().getRaw(xyzzy, aList); } public Set getXyzzy_aSet() { - return tx.currentState().get(xyzzy, aSet); + return tx.currentState().getRaw(xyzzy, aSet); } public Set getXyzzy_extraSet() { - return tx.currentState().get(xyzzy, extraSet); + return tx.currentState().getRaw(xyzzy, extraSet); } public Map getXyzzy_aMap() { - return tx.currentState().get(xyzzy, aMap); + return tx.currentState().getRaw(xyzzy, aMap); } public DefaultMap getXyzzy_aDefMap() { - return tx.currentState().get(xyzzy, aDefMap); + return tx.currentState().getRaw(xyzzy, aDefMap); } public QualifiedSet getXyzzy_aQuaSet() { - return tx.currentState().get(xyzzy, aQuaSet); + return tx.currentState().getRaw(xyzzy, aQuaSet); } public TestMutable getXyzzy_extra() { - return tx.currentState().get(xyzzy, extra); + return tx.currentState().getRaw(xyzzy, extra); } } From 97dcb1b89b380cb99e94fde1527a55db9d09c9ff Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 15 May 2025 16:33:12 +0200 Subject: [PATCH 155/179] stackoverflow fix --- src/main/java/org/modelingvalue/dclare/State.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index 6a8e5c30..f4cff558 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -402,7 +402,7 @@ public TransactionId transactionId() { @Override public T getRaw(O object, Getable property) { - return get(object, property); + return super.get(object, property); } @Override From 4135d02be116a3f0ca5dc7d114a2c599e7a42220 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 15 May 2025 16:41:17 +0200 Subject: [PATCH 156/179] get iso getRaw for tracing --- src/main/java/org/modelingvalue/dclare/ObserverTransaction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index c329dcfa..4d7e1d28 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -229,7 +229,7 @@ private ObserverTrace trace(State pre, DefaultMap> observ ObserverTrace trace = new ObserverTrace(mutable(), observer(), traces.last(), nrOfChanges, // observeds.filter(e -> !e.getKey().isPlumbing()).flatMap(e -> e.getValue().map(m -> { m = m.dResolve(mutable()); - return Entry.of(ObservedInstance.of(m, e.getKey()), pre.getRaw(m, e.getKey())); + return Entry.of(ObservedInstance.of(m, e.getKey()), pre.get(m, e.getKey())); })).asMap(e -> e), // pre.diff(current(), o -> o instanceof Mutable, s -> s instanceof Observed && !s.isPlumbing()).// flatMap(e1 -> e1.getValue().map(e2 -> Entry.of(ObservedInstance.of((Mutable) e1.getKey(), (Observed) e2.getKey()), e2.getValue().b()))).asMap(e -> e)); From c9b9adc74d2a94ac083aae8449b1876289a6aa07 Mon Sep 17 00:00:00 2001 From: WimBast Date: Tue, 20 May 2025 11:23:00 +0200 Subject: [PATCH 157/179] derivation tracing --- .../dclare/AbstractDerivationTransaction.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 46940f98..2066ec7d 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -151,7 +151,7 @@ private T derive(O object, Getable getable, T nonDerived) { @SuppressWarnings({"rawtypes", "unchecked"}) protected void runDeriver(Mutable mutable, Observed observed, Observer observer, int i) { - if (isTraceDerivation(mutable, observed)) { + if (isTraceDerivation(mutable, observed) || observer.isTracing()) { runSilent(() -> System.err.println(tracePre(mutable, this) + String.format(">>%d> ", i) + mutable + "." + observer + "()")); } INDENT.run(INDENT.get() + 1, () -> DERIVER.run(Pair.of(mutable, observer), () -> { @@ -218,9 +218,9 @@ private T set(O object, Setable setable, T post, T nonDerived) { } else { setInMemoization(mem, object, observed, result, false); } - if (isTraceDerivation(object, observed)) { + Pair deriver = DERIVER.get(); + if (isTraceDerivation(object, observed) || (deriver != null && deriver.b().isTracing())) { runSilent(() -> { - Pair deriver = DERIVER.get(); if (deriver != null) { System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); } else { @@ -301,6 +301,11 @@ public O construct(Reason reason, Supplier supplier) { Construction cons = Construction.of(deriver.a(), deriver.b(), reason); setInMemoization(memoization(deriver.a()), result, Newable.D_ALL_DERIVATIONS, Newable.D_ALL_DERIVATIONS.getDefault(result).add(cons), true); Mutable.D_INITIAL_CONSTRUCTION.force(result, cons); + if (isTraceDerivation(deriver.a(), null) || deriver.b().isTracing()) { + runSilent(() -> { + System.err.println(tracePre(deriver.a(), this) + "CON " + deriver.a() + "." + deriver.b() + "(" + cons.reason() + "->" + result + ")"); + }); + } return result; } From 4a89483617dfd009344b797fb8aaa3ac130f8ac2 Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 22 May 2025 10:28:07 +0200 Subject: [PATCH 158/179] check in doDeriveSet --- .../dclare/AbstractDerivationTransaction.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 2066ec7d..37f6d1f5 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -76,7 +76,7 @@ protected boolean doDeriveGet(O object, Getable getable, T nonDeriv @SuppressWarnings("rawtypes") protected boolean doDeriveSet(O object, Getable getable, T nonDerived) { - return object instanceof Mutable && getable instanceof Observed && isDeriving(); + return object instanceof Mutable && getable instanceof Observed && DERIVER.get() != null; } protected T getNonDerived(O object, Getable getable) { @@ -219,13 +219,9 @@ private T set(O object, Setable setable, T post, T nonDerived) { setInMemoization(mem, object, observed, result, false); } Pair deriver = DERIVER.get(); - if (isTraceDerivation(object, observed) || (deriver != null && deriver.b().isTracing())) { + if (isTraceDerivation(object, observed) || deriver.b().isTracing()) { runSilent(() -> { - if (deriver != null) { - System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); - } else { - System.err.println(tracePre(object, this) + "SET (" + object + "." + observed + "=" + pre + "->" + result + ")"); - } + System.err.println(tracePre(object, this) + "SET " + deriver.a() + "." + deriver.b() + "(" + object + "." + observed + "=" + pre + "->" + result + ")"); }); } if (observed.containment()) { From ea80d71ce723c5a976c2bcce608b091795f1f45a Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Thu, 22 May 2025 19:31:01 +0200 Subject: [PATCH 159/179] update --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d766c58b..40ab4a71 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,7 @@ on: [ push, workflow_dispatch ] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[no-ci]')" env: ALLREP_TOKEN: "${{secrets.ALLREP_TOKEN}}" From f7706bacb932bcb239221fc549b2432877fe0383 Mon Sep 17 00:00:00 2001 From: Jeroen Thunnissen Date: Sat, 24 May 2025 15:26:56 +0200 Subject: [PATCH 160/179] ignore vscode --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ef8b1b21..9e7dc34d 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,9 @@ tmp/ tmp/** tmp/**/* +#### vscode +.vscode/ + #### java (https://github.com/github/gitignore/blob/master/Java.gitignore) *.class *.ear @@ -90,4 +93,4 @@ gradle-app.setting /TEST-*.xml **/*_gen **/*_gen.caches -.mps/workspace.xml +.mps/workspace.xml \ No newline at end of file From ed953cdda52bf3f115073ce838999a8af636747f Mon Sep 17 00:00:00 2001 From: WimBast Date: Thu, 29 May 2025 09:38:04 +0200 Subject: [PATCH 161/179] simple pushNow --- src/main/java/org/modelingvalue/dclare/Mutable.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index c96653c0..fc326f76 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -192,13 +192,13 @@ default void pushNow() { AbstractDerivationTransaction tx = (AbstractDerivationTransaction) LeafTransaction.getCurrent(); try { MutableClass dClass = dClass(); + Set nonDerivers = MutableClass.D_NON_DERIVERS.get(dClass).asSet(); + nonDerivers.forEach(o -> tx.runDeriver(this, null, o, 0)); Set containments = MutableClass.D_CONTAINMENTS.get(dClass); Set children = containments.flatMap(s -> s. getCollection(this)).asSet(); children.forEach(m -> m.pushNow()); - Set nonDerivers = MutableClass.D_NON_DERIVERS.get(dClass).asSet(); - nonDerivers.forEach(o -> tx.runDeriver(this, null, o, 0)); - Set observeds = MutableClass.D_PUSH_IF_PULL.get(dClass); - observeds.forEach(o -> o.get(this)); + // Set observeds = MutableClass.D_PUSH_IF_PULL.get(dClass); + // observeds.forEach(o -> o.get(this)); } catch (Throwable t) { tx.universeTransaction().handleException(t); } From ea03c612d91c01404b055aae180efd1d43f0b7b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:32:51 +0000 Subject: [PATCH 162/179] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 40ab4a71..e67b3d3a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,7 @@ jobs: TOKEN: "${{secrets.ALLREP_TOKEN}}" CI: "true" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 From a569094ad5fc667c602202df548c659ffb778c16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 03:17:46 +0000 Subject: [PATCH 163/179] Bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 40ab4a71..bb973516 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: java-version: 17 distribution: zulu From 0487f7e0eed38cd0581d75c6b12db19880af7e50 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Tue, 2 Dec 2025 13:38:15 +0100 Subject: [PATCH 164/179] bump checkout to v6 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7209a488..1b87c775 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,7 @@ jobs: TOKEN: "${{secrets.ALLREP_TOKEN}}" CI: "true" steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 From d047cbb890dbd0323e506fec78d582c5f5d871c1 Mon Sep 17 00:00:00 2001 From: automation Date: Fri, 9 Jan 2026 13:16:53 +0000 Subject: [PATCH 165/179] [no-ci] updated by mvgplugin --- .github/dependabot.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 +- settings.gradle.kts | 2 +- .../org/modelingvalue/dclare/AbstractDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Action.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/ActionTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Constant.java | 2 +- src/main/java/org/modelingvalue/dclare/ConstantState.java | 2 +- src/main/java/org/modelingvalue/dclare/Construction.java | 2 +- src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareConfig.java | 2 +- src/main/java/org/modelingvalue/dclare/DclareTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/Derivation.java | 2 +- .../java/org/modelingvalue/dclare/DerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Direction.java | 2 +- src/main/java/org/modelingvalue/dclare/Feature.java | 2 +- src/main/java/org/modelingvalue/dclare/FeatureModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/FixpointGroup.java | 2 +- src/main/java/org/modelingvalue/dclare/Getable.java | 2 +- src/main/java/org/modelingvalue/dclare/ILeafTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/IState.java | 2 +- src/main/java/org/modelingvalue/dclare/IdentityDerivation.java | 2 +- .../org/modelingvalue/dclare/IdentityDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Imperative.java | 2 +- .../java/org/modelingvalue/dclare/ImperativeTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/JsonToState.java | 2 +- src/main/java/org/modelingvalue/dclare/LazyDerivation.java | 2 +- .../org/modelingvalue/dclare/LazyDerivationTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Leaf.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/LeafTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/MatchInfo.java | 2 +- src/main/java/org/modelingvalue/dclare/Mutable.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableClass.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableState.java | 2 +- src/main/java/org/modelingvalue/dclare/MutableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Newable.java | 2 +- src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java | 2 +- .../java/org/modelingvalue/dclare/NonInternableObserver.java | 2 +- src/main/java/org/modelingvalue/dclare/Observed.java | 2 +- src/main/java/org/modelingvalue/dclare/ObservedInstance.java | 2 +- src/main/java/org/modelingvalue/dclare/Observer.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTrace.java | 2 +- src/main/java/org/modelingvalue/dclare/ObserverTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/OneShot.java | 2 +- src/main/java/org/modelingvalue/dclare/Priority.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnly.java | 2 +- src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ReusableTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/Setable.java | 2 +- src/main/java/org/modelingvalue/dclare/SetableModifier.java | 2 +- src/main/java/org/modelingvalue/dclare/State.java | 2 +- src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMap.java | 2 +- src/main/java/org/modelingvalue/dclare/StateMergeHandler.java | 2 +- src/main/java/org/modelingvalue/dclare/StateToJson.java | 2 +- src/main/java/org/modelingvalue/dclare/This.java | 2 +- src/main/java/org/modelingvalue/dclare/Transaction.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionClass.java | 2 +- src/main/java/org/modelingvalue/dclare/TransactionId.java | 2 +- src/main/java/org/modelingvalue/dclare/TypeWrapper.java | 2 +- src/main/java/org/modelingvalue/dclare/Universe.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseStatistics.java | 2 +- src/main/java/org/modelingvalue/dclare/UniverseTransaction.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java | 2 +- .../modelingvalue/dclare/ex/CycleInParentChainException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java | 2 +- .../org/modelingvalue/dclare/ex/EmptyMandatoryException.java | 2 +- .../modelingvalue/dclare/ex/NoCurrentTransactionException.java | 2 +- .../org/modelingvalue/dclare/ex/NonDeterministicException.java | 2 +- .../org/modelingvalue/dclare/ex/NotYetDerivableException.java | 2 +- .../java/org/modelingvalue/dclare/ex/OutOfScopeException.java | 2 +- .../org/modelingvalue/dclare/ex/ReferencedOrphanException.java | 2 +- src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyChangesException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObservedException.java | 2 +- .../org/modelingvalue/dclare/ex/TooManyObserversException.java | 2 +- .../java/org/modelingvalue/dclare/ex/TransactionException.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Converters.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/JsonIC.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerialisationPool.java | 2 +- .../java/org/modelingvalue/dclare/sync/SerializationHelper.java | 2 +- .../modelingvalue/dclare/sync/SerializationHelperWithPool.java | 2 +- .../org/modelingvalue/dclare/sync/SocketSyncConnection.java | 2 +- .../java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java | 2 +- .../org/modelingvalue/dclare/sync/SyncConnectionHandler.java | 2 +- .../org/modelingvalue/dclare/sync/UniverseSynchronizer.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/Util.java | 2 +- src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java | 2 +- .../java/org/modelingvalue/dclare/test/CommunicationTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/DclareTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/JsonICTests.java | 2 +- src/test/java/org/modelingvalue/dclare/test/NewableTests.java | 2 +- .../org/modelingvalue/dclare/test/SerialisationPoolTests.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationHelper.java | 2 +- .../modelingvalue/dclare/test/support/CommunicationPeer.java | 2 +- .../java/org/modelingvalue/dclare/test/support/Fibonacci.java | 2 +- .../java/org/modelingvalue/dclare/test/support/ModelMaker.java | 2 +- .../org/modelingvalue/dclare/test/support/OneShotTests.java | 2 +- .../java/org/modelingvalue/dclare/test/support/PeerTester.java | 2 +- src/test/java/org/modelingvalue/dclare/test/support/Shared.java | 2 +- .../org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestMutable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestMutableClass.java | 2 +- .../java/org/modelingvalue/dclare/test/support/TestNewable.java | 2 +- .../org/modelingvalue/dclare/test/support/TestNewableClass.java | 2 +- .../org/modelingvalue/dclare/test/support/TestObserved.java | 2 +- .../org/modelingvalue/dclare/test/support/TestScheduler.java | 2 +- .../org/modelingvalue/dclare/test/support/TestUniverse.java | 2 +- 113 files changed, 113 insertions(+), 113 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 49c8a9f2..84fb5d05 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/build.gradle.kts b/build.gradle.kts index 0ea5e6d2..61a74281 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/gradle.properties b/gradle.properties index e9e5f23f..0700e726 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ ## ~ ## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ ## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/settings.gradle.kts b/settings.gradle.kts index f521fe01..7713da97 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java index 37f6d1f5..c393445a 100644 --- a/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/AbstractDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Action.java b/src/main/java/org/modelingvalue/dclare/Action.java index 5cda0fd5..7ad5df55 100644 --- a/src/main/java/org/modelingvalue/dclare/Action.java +++ b/src/main/java/org/modelingvalue/dclare/Action.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionInstance.java b/src/main/java/org/modelingvalue/dclare/ActionInstance.java index c1c8573f..15ab8358 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ActionInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java index 5af2f54c..bb055b8b 100644 --- a/src/main/java/org/modelingvalue/dclare/ActionTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ActionTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Constant.java b/src/main/java/org/modelingvalue/dclare/Constant.java index 0ff59da6..9fab6bf2 100644 --- a/src/main/java/org/modelingvalue/dclare/Constant.java +++ b/src/main/java/org/modelingvalue/dclare/Constant.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 10fe9875..9dc2d488 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Construction.java b/src/main/java/org/modelingvalue/dclare/Construction.java index 2fc5593c..f0700bfd 100644 --- a/src/main/java/org/modelingvalue/dclare/Construction.java +++ b/src/main/java/org/modelingvalue/dclare/Construction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java index 37f99f26..ad8a3a6a 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreLeafModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java index 136b5c73..b9da6efb 100644 --- a/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/CoreSetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareConfig.java b/src/main/java/org/modelingvalue/dclare/DclareConfig.java index b835ca90..a495f143 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareConfig.java +++ b/src/main/java/org/modelingvalue/dclare/DclareConfig.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DclareTrace.java b/src/main/java/org/modelingvalue/dclare/DclareTrace.java index a5ccce29..faddb4da 100644 --- a/src/main/java/org/modelingvalue/dclare/DclareTrace.java +++ b/src/main/java/org/modelingvalue/dclare/DclareTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Derivation.java b/src/main/java/org/modelingvalue/dclare/Derivation.java index 42ad1cf7..0db13aef 100644 --- a/src/main/java/org/modelingvalue/dclare/Derivation.java +++ b/src/main/java/org/modelingvalue/dclare/Derivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java index 75517cf5..943b9103 100644 --- a/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/DerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Direction.java b/src/main/java/org/modelingvalue/dclare/Direction.java index 21645f10..8af76d7e 100644 --- a/src/main/java/org/modelingvalue/dclare/Direction.java +++ b/src/main/java/org/modelingvalue/dclare/Direction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Feature.java b/src/main/java/org/modelingvalue/dclare/Feature.java index 0726a141..05ae9efe 100644 --- a/src/main/java/org/modelingvalue/dclare/Feature.java +++ b/src/main/java/org/modelingvalue/dclare/Feature.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java index 67ab196f..b703fdac 100644 --- a/src/main/java/org/modelingvalue/dclare/FeatureModifier.java +++ b/src/main/java/org/modelingvalue/dclare/FeatureModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java index f3b7a3c2..cb14d914 100644 --- a/src/main/java/org/modelingvalue/dclare/FixpointGroup.java +++ b/src/main/java/org/modelingvalue/dclare/FixpointGroup.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Getable.java b/src/main/java/org/modelingvalue/dclare/Getable.java index eeb145e4..c4d5d9bc 100644 --- a/src/main/java/org/modelingvalue/dclare/Getable.java +++ b/src/main/java/org/modelingvalue/dclare/Getable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java index dd20f832..7dfad2ab 100644 --- a/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ILeafTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IState.java b/src/main/java/org/modelingvalue/dclare/IState.java index 5d8d02fe..3f3e4539 100644 --- a/src/main/java/org/modelingvalue/dclare/IState.java +++ b/src/main/java/org/modelingvalue/dclare/IState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java index 75d36a65..e5e83114 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java index b97913a2..ccf715a6 100644 --- a/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/IdentityDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Imperative.java b/src/main/java/org/modelingvalue/dclare/Imperative.java index 1f8aba2a..6f2034e9 100644 --- a/src/main/java/org/modelingvalue/dclare/Imperative.java +++ b/src/main/java/org/modelingvalue/dclare/Imperative.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java index 9ad05ef9..ee97dfb9 100644 --- a/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ImperativeTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/JsonToState.java b/src/main/java/org/modelingvalue/dclare/JsonToState.java index 3d1cab4e..3e8bebcc 100644 --- a/src/main/java/org/modelingvalue/dclare/JsonToState.java +++ b/src/main/java/org/modelingvalue/dclare/JsonToState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java index 43e5e09b..5eb1ddaf 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivation.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivation.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java index 76092b2d..b32c64ab 100644 --- a/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LazyDerivationTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Leaf.java b/src/main/java/org/modelingvalue/dclare/Leaf.java index 7ad05b3d..58804fa8 100644 --- a/src/main/java/org/modelingvalue/dclare/Leaf.java +++ b/src/main/java/org/modelingvalue/dclare/Leaf.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafModifier.java b/src/main/java/org/modelingvalue/dclare/LeafModifier.java index af32abef..b696359a 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafModifier.java +++ b/src/main/java/org/modelingvalue/dclare/LeafModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java index 20345164..6a064a78 100644 --- a/src/main/java/org/modelingvalue/dclare/LeafTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/LeafTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MatchInfo.java b/src/main/java/org/modelingvalue/dclare/MatchInfo.java index 3ce34283..c4f7654a 100644 --- a/src/main/java/org/modelingvalue/dclare/MatchInfo.java +++ b/src/main/java/org/modelingvalue/dclare/MatchInfo.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Mutable.java b/src/main/java/org/modelingvalue/dclare/Mutable.java index fc326f76..c4041d27 100644 --- a/src/main/java/org/modelingvalue/dclare/Mutable.java +++ b/src/main/java/org/modelingvalue/dclare/Mutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableClass.java b/src/main/java/org/modelingvalue/dclare/MutableClass.java index 2c021d96..12ea480f 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableClass.java +++ b/src/main/java/org/modelingvalue/dclare/MutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableState.java b/src/main/java/org/modelingvalue/dclare/MutableState.java index 74f3409f..92400093 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableState.java +++ b/src/main/java/org/modelingvalue/dclare/MutableState.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java index 4579064a..117cf6bb 100644 --- a/src/main/java/org/modelingvalue/dclare/MutableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/MutableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Newable.java b/src/main/java/org/modelingvalue/dclare/Newable.java index fd689459..d553f4c8 100644 --- a/src/main/java/org/modelingvalue/dclare/Newable.java +++ b/src/main/java/org/modelingvalue/dclare/Newable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java index 4c37f0a4..f1257bfb 100644 --- a/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonCheckingObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java index a369194f..81e27a44 100644 --- a/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java +++ b/src/main/java/org/modelingvalue/dclare/NonInternableObserver.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observed.java b/src/main/java/org/modelingvalue/dclare/Observed.java index 6d697fb5..2931fdd9 100644 --- a/src/main/java/org/modelingvalue/dclare/Observed.java +++ b/src/main/java/org/modelingvalue/dclare/Observed.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java index b1752374..111eabc3 100644 --- a/src/main/java/org/modelingvalue/dclare/ObservedInstance.java +++ b/src/main/java/org/modelingvalue/dclare/ObservedInstance.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Observer.java b/src/main/java/org/modelingvalue/dclare/Observer.java index b55004f1..81934b4a 100644 --- a/src/main/java/org/modelingvalue/dclare/Observer.java +++ b/src/main/java/org/modelingvalue/dclare/Observer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java index 57845284..4f55699d 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java index 4d7e1d28..61d07379 100644 --- a/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ObserverTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 8bf20d7d..9c41f1da 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Priority.java b/src/main/java/org/modelingvalue/dclare/Priority.java index 9611bb33..b474a280 100644 --- a/src/main/java/org/modelingvalue/dclare/Priority.java +++ b/src/main/java/org/modelingvalue/dclare/Priority.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnly.java b/src/main/java/org/modelingvalue/dclare/ReadOnly.java index 55bf3c79..81d73fd7 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnly.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnly.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java index 4776c5fb..a4a861ee 100644 --- a/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReadOnlyTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java index 6a216e7b..59ba7d09 100644 --- a/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/ReusableTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Setable.java b/src/main/java/org/modelingvalue/dclare/Setable.java index 8ccc05bf..ea2fd447 100644 --- a/src/main/java/org/modelingvalue/dclare/Setable.java +++ b/src/main/java/org/modelingvalue/dclare/Setable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/SetableModifier.java b/src/main/java/org/modelingvalue/dclare/SetableModifier.java index eb0181c7..27d57b9f 100644 --- a/src/main/java/org/modelingvalue/dclare/SetableModifier.java +++ b/src/main/java/org/modelingvalue/dclare/SetableModifier.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/State.java b/src/main/java/org/modelingvalue/dclare/State.java index f4cff558..1d1bae4a 100644 --- a/src/main/java/org/modelingvalue/dclare/State.java +++ b/src/main/java/org/modelingvalue/dclare/State.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java index 85df0428..bf53d7b5 100644 --- a/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateDeltaHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMap.java b/src/main/java/org/modelingvalue/dclare/StateMap.java index 363403fa..24ff618d 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMap.java +++ b/src/main/java/org/modelingvalue/dclare/StateMap.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java index 1791e3ac..e4f685e9 100644 --- a/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java +++ b/src/main/java/org/modelingvalue/dclare/StateMergeHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/StateToJson.java b/src/main/java/org/modelingvalue/dclare/StateToJson.java index a7cdaf4a..eb802a6b 100644 --- a/src/main/java/org/modelingvalue/dclare/StateToJson.java +++ b/src/main/java/org/modelingvalue/dclare/StateToJson.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/This.java b/src/main/java/org/modelingvalue/dclare/This.java index 24914670..f554802a 100644 --- a/src/main/java/org/modelingvalue/dclare/This.java +++ b/src/main/java/org/modelingvalue/dclare/This.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Transaction.java b/src/main/java/org/modelingvalue/dclare/Transaction.java index 3f4af914..471ebd1e 100644 --- a/src/main/java/org/modelingvalue/dclare/Transaction.java +++ b/src/main/java/org/modelingvalue/dclare/Transaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionClass.java b/src/main/java/org/modelingvalue/dclare/TransactionClass.java index 4562ff8e..f28b3c8f 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionClass.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TransactionId.java b/src/main/java/org/modelingvalue/dclare/TransactionId.java index edbd07ed..46338f86 100644 --- a/src/main/java/org/modelingvalue/dclare/TransactionId.java +++ b/src/main/java/org/modelingvalue/dclare/TransactionId.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java index 90624f8e..be103c87 100644 --- a/src/main/java/org/modelingvalue/dclare/TypeWrapper.java +++ b/src/main/java/org/modelingvalue/dclare/TypeWrapper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/Universe.java b/src/main/java/org/modelingvalue/dclare/Universe.java index e8badb9d..da0c16e1 100644 --- a/src/main/java/org/modelingvalue/dclare/Universe.java +++ b/src/main/java/org/modelingvalue/dclare/Universe.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java index b413c996..8b22a1dd 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseStatistics.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index c6639518..028cd229 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java index 1719b0b7..f3a195a8 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ConsistencyError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java index 017f0b52..3df29a71 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/CycleInParentChainException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java index 8c5aff09..b9d4ad2f 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java +++ b/src/main/java/org/modelingvalue/dclare/ex/DebugTrace.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java index 673760f0..1465e946 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/EmptyMandatoryException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java index fa49dfcb..40df3c4a 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NoCurrentTransactionException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java index 6d278c9b..99970f99 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NonDeterministicException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java index 44269a1b..b7f5606e 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/NotYetDerivableException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java index 9b290779..b9121ab0 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/OutOfScopeException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java index bf93cf0c..99636f02 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ReferencedOrphanException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java index 2e471c4a..984d605e 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java +++ b/src/main/java/org/modelingvalue/dclare/ex/ThrowableError.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java index 0543262d..ed0c8c04 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyChangesException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java index d8f99a1f..9ba59220 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObservedException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java index 46714b68..817d968b 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TooManyObserversException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java index aca1754c..ee77e4b7 100644 --- a/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java +++ b/src/main/java/org/modelingvalue/dclare/ex/TransactionException.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Converters.java b/src/main/java/org/modelingvalue/dclare/sync/Converters.java index cf086944..3c53b8d3 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Converters.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Converters.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java index 4ae64aed..ade8bb0a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java +++ b/src/main/java/org/modelingvalue/dclare/sync/DeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java index e4eb970b..59503afe 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java +++ b/src/main/java/org/modelingvalue/dclare/sync/JsonIC.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java index 5662518a..8c29d151 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerialisationPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java index 806722b8..df079547 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java index 1070086c..4b83391c 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SerializationHelperWithPool.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java index 95031fd0..b07be160 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SocketSyncConnection.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java index 4a2790ff..b9cec47a 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SupplierAndConsumer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java index addc9518..10c75450 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java +++ b/src/main/java/org/modelingvalue/dclare/sync/SyncConnectionHandler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java index 902ea775..a4901cbf 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java +++ b/src/main/java/org/modelingvalue/dclare/sync/UniverseSynchronizer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/Util.java b/src/main/java/org/modelingvalue/dclare/sync/Util.java index d0801c38..ab1d59f8 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/Util.java +++ b/src/main/java/org/modelingvalue/dclare/sync/Util.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java index 2020d963..031bf4a8 100644 --- a/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java +++ b/src/main/java/org/modelingvalue/dclare/sync/WorkDaemon.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java index e6533a8a..d4873f06 100644 --- a/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/CommunicationTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java index 0b270e38..5ff60609 100644 --- a/src/test/java/org/modelingvalue/dclare/test/DclareTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/DclareTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java index a2effcab..e6b41ea5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/JsonICTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java index 71347ed4..ba0685ee 100644 --- a/src/test/java/org/modelingvalue/dclare/test/NewableTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/NewableTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java index 9a4f8dcb..5c03a868 100644 --- a/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/SerialisationPoolTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java index 6d2e21dd..37ebb4e5 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationHelper.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java index 3747156f..9cbcc43c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/CommunicationPeer.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java index 6461d29e..43e43d84 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Fibonacci.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java index 232899c7..6da90656 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/ModelMaker.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java index 990c6ec5..e3e3946e 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/OneShotTests.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java index a8ee8e95..47243397 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/PeerTester.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java index 9128f2be..81cea613 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/Shared.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/Shared.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java index 74286a9f..f2acf6c3 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestDeltaAdaptor.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java index dc11848b..a86b7022 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java index c29f7c59..2aed2032 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestMutableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java index 9898a970..d400433a 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewable.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java index f4136d54..c553360d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestNewableClass.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java index dd7fd436..f1e99b2c 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestObserved.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java index d6f3dfe4..4693d9d8 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestScheduler.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ diff --git a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java index 079329ba..fd84de1d 100644 --- a/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java +++ b/src/test/java/org/modelingvalue/dclare/test/support/TestUniverse.java @@ -1,5 +1,5 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2025 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ // Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ // compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ From 2357341a32102fe5c53361f1822d2b0f04700e5e Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Thu, 26 Feb 2026 22:31:46 +0100 Subject: [PATCH 166/179] upgrade to java21 and gradle 9 --- build.gradle.kts | 2 +- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 29 +++++++++++++---------- gradlew.bat | 20 ++++++++-------- settings.gradle.kts | 12 ++++++---- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 61a74281..d97032a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ defaultTasks("mvgCorrector", "test", "publish", "mvgTagger") plugins { `java-library` `maven-publish` - id("org.modelingvalue.gradle.mvgplugin") version "1.1.3" + id("org.modelingvalue.gradle.mvgplugin") version "2.3.15" idea eclipse } diff --git a/gradle.properties b/gradle.properties index 0700e726..410a7699 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ # suppress inspection "UnusedProperty" for whole file group = org.modelingvalue artifact = dclare -version = 4.1.0 -version_java = 17 +version = 5.1.0 +version_java = 21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 ScNgau(U?ep-K_E5zy1%ZQTdPn diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 20db9ad5..37f78a6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f..25da30db 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle.kts b/settings.gradle.kts index 7713da97..50a6cd87 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,10 @@ +pluginManagement { + repositories { + maven { url = uri("https://modelingvaluegroup.github.io/gradlePlugins/") } + gradlePluginPortal() + } +} + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ // ~ @@ -21,11 +28,6 @@ rootProject.name = "dclare" include() - -plugins { - id("com.gradle.enterprise") version ("3.5") -} - val inEclipse=System.getenv("GRADLE_ECLIPSE") println("Gradle: inEclipse="+inEclipse) if(inEclipse!=null && inEclipse.equals("true")) { From 6de6d9d0f82c580d770892a6f8c0aaef8b6fc183 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Mon, 2 Mar 2026 12:11:55 +0100 Subject: [PATCH 167/179] upgrade IntelliJ project SDK to Java 21 --- .idea/misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f82f21f..0e6a221d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -30,7 +30,7 @@ - +

SdO`o?U^bCPz6Ehh!k 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

Xdyd*p!l1Y@nCA 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6a..dbc3ce4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685a..0262dcbd 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From edacc7f4a8243ff92a87f0a4af17b2ada2759b54 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Fri, 6 Mar 2026 20:07:28 +0100 Subject: [PATCH 174/179] add CLAUDE.md for repository guidelines and introduce `OneShotTracer` interface for detailed trace logging --- CLAUDE.md | 107 ++++++++ .../org/modelingvalue/dclare/OneShot.java | 239 ++++++++---------- .../modelingvalue/dclare/OneShotTracer.java | 132 ++++++++++ 3 files changed, 345 insertions(+), 133 deletions(-) create mode 100644 CLAUDE.md create mode 100644 src/main/java/org/modelingvalue/dclare/OneShotTracer.java diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..bbfddcea --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,107 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Project Overview + +**dclare** is a declarative rule engine for Java. Rules are enforced continuously and automatically — no listeners needed. The implementation is heavily multi-threaded while the API exposes no concurrency primitives. + +- **Group:** `org.modelingvalue`, **Artifact:** `dclare`, **Version:** 5.1.0 +- **Java:** 21 +- **License:** LGPL-3.0 +- **Dependencies:** `immutable-collections` and `mvg-json` (both from org.modelingvalue) + +## Build Commands + +```bash +./gradlew # Runs default tasks: mvgCorrector, test, publish, mvgTagger +./gradlew test # Run all tests +./gradlew test --tests "org.modelingvalue.dclare.test.DclareTests.source2target" # Single test method +./gradlew test --tests "org.modelingvalue.dclare.test.DclareTests" # Single test class +``` + +There is no separate lint command; the `mvgCorrector` task handles code corrections (copyright headers, formatting). + +## Architecture + +### Core Abstractions + +The engine is built around a **transaction-based state machine** where immutable `State` snapshots evolve through transactions: + +- **Universe** — Root mutable object; entry point for the entire model. Created via `Universe.of(...)`. +- **Mutable** — Base interface for all model objects. Establishes parent/child containment hierarchy. +- **MutableClass** — Metadata interface describing the features (observables, observers, derivers) of a Mutable type. + +### Property System (Getable → Setable → Observed/Constant) + +- **Getable** — Base readable property with ID and default function. +- **Setable** — Writable property. Supports opposites, scoping, orphan protection. +- **Observed** — Tracked property that triggers observer re-evaluation on change. +- **Constant** — Derived/cached value computed from a deriver function. Can be lazy or pushed. + +### Rule System (Leaf → Action/Observer) + +- **Action** — Imperative operation triggered by state changes. Has priority and direction. +- **Observer** — Declarative rule that re-executes when its dependencies change. The primary mechanism for maintaining consistency. +- **Derivation** — Lazy computation that evaluates on demand. + +### Transaction Hierarchy + +``` +Transaction (abstract) +├── LeafTransaction (abstract) +│ ├── ActionTransaction +│ ├── ObserverTransaction +│ ├── DerivationTransaction / LazyDerivationTransaction / IdentityDerivationTransaction +│ ├── ReadOnlyTransaction +│ └── ImperativeTransaction +├── MutableTransaction +└── UniverseTransaction ← orchestrates the overall execution loop +``` + +### Priority Scheduling + +Actions/Observers have priorities (`Priority.one` through `Priority.six`) controlling execution order. Lower priorities execute first. `Priority.zero` represents the currently executing level. + +### Modifiers + +- **SetableModifier** / **CoreSetableModifier** — containment, mandatory, preserved, plumbing, durable, doNotMerge, symmetricOpposite +- **LeafModifier** / **CoreLeafModifier** — preserved, read +- **Direction** — Push (eager) vs Pull (lazy) evaluation + +### Synchronization Module (`sync/`) + +Enables multi-instance state synchronization via JSON deltas. Key classes: `DeltaAdaptor`, `SerialisationPool`, `UniverseSynchronizer`, `SocketSyncConnection`. + +### OneShot + +Abstract class for single-run model initialization. Methods annotated with `@OneShotAction` are discovered and executed in alphabetical order. Supports state caching. + +## Naming Conventions + +- `D_` prefix — Internal system properties on Mutable (e.g., `D_PARENT_CONTAINING`, `D_OBSERVERS`) +- `d*()` methods — Dclare-specific operations on Mutable (e.g., `dParent()`, `dChildren()`, `dDelete()`) +- Factory pattern — Most core types use `of(...)` static factory methods +- Property access — `.get(object)` to read, `.set(object, value)` to write within transaction context + +## Configuration + +`DclareConfig` supports system properties for debugging: + +- `DEV_MODE` — Enable debug features +- `RUN_SEQUENTIAL` — Disable parallelism (useful for debugging) +- `CHECK_ORPHAN_STATE` — Validate orphan handling +- `TRACE_UNIVERSE`, `TRACE_MUTABLE`, `TRACE_ACTIONS`, `TRACE_MATCHING`, `TRACE_RIPPLE_OUT`, `TRACE_DERIVATION` — Various tracing flags +- `MAX_TOTAL_NR_OF_CHANGES`, `MAX_NR_OF_CHANGES`, `MAX_NR_OF_OBSERVED`, `MAX_NR_OF_OBSERVERS` — Safety limits + +## Testing + +Tests use JUnit 5. Test support classes are in `src/test/java/org/modelingvalue/dclare/test/support/` providing `TestUniverse`, `TestMutable`, `TestMutableClass`, and other helpers for constructing test models. + +## File Headers + +All source files include a copyright header block for Modeling Value Group B.V. The `mvgCorrector` gradle task maintains these automatically. + +## Eclipse Integration + +When `GRADLE_ECLIPSE=true` environment variable is set, the build uses `includeBuild` to substitute local checkouts of `immutable-collections` and `mvg-json` from sibling directories. diff --git a/src/main/java/org/modelingvalue/dclare/OneShot.java b/src/main/java/org/modelingvalue/dclare/OneShot.java index 9c41f1da..9f16031d 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShot.java +++ b/src/main/java/org/modelingvalue/dclare/OneShot.java @@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import java.util.function.Predicate; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -59,18 +57,27 @@ */ @SuppressWarnings("unused") public abstract class OneShot { - private static final boolean TRACE_ONE_SHOT = Boolean.getBoolean("TRACE_ONE_SHOT"); - private static final String TRACE_ONE_SHOT_OBJECT = System.getProperty("TRACE_ONE_SHOT_OBJECT"); - private static final String TRACE_ONE_SHOT_SETABLE = System.getProperty("TRACE_ONE_SHOT_SETABLE"); - private static final MutationWrapper, StateMap>> STATE_MAP_CACHE = new MutationWrapper<>(Map.of()); - private static final MutationWrapper, Set>> ALL_METHODS_CACHE = new MutationWrapper<>(Map.of()); - private static final MutationWrapper, ConstantState>> CONSTANT_STATE_CACHE = new MutationWrapper<>(Map.of()); - private static final ContextPoolPool CONTEXT_POOL_POOL = new ContextPoolPool(); - - private final Class cacheKey = getClass(); - private final U universe; - private final boolean pull; - private State endState; + private static final MutationWrapper, StateMap>> STATE_MAP_CACHE = new MutationWrapper<>(Map.of()); + private static final MutationWrapper, Set>> ALL_METHODS_CACHE = new MutationWrapper<>(Map.of()); + private static final MutationWrapper, ConstantState>> CONSTANT_STATE_CACHE = new MutationWrapper<>(Map.of()); + private static OneShotTracer TRACER = new OneShotTracer.ToStderr(); + private static ContextPoolPool CONTEXT_POOL_POOL; + + public static void setTracer(OneShotTracer tracer) { + TRACER = tracer; + } + + private static synchronized ContextPoolPool contextPoolPool() { + if (CONTEXT_POOL_POOL == null) { + CONTEXT_POOL_POOL = new ContextPoolPool(); + } + return CONTEXT_POOL_POOL; + } + + private final Class cacheKey = getClass(); + private final U universe; + private final boolean pull; + private State endState; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @@ -78,10 +85,9 @@ public abstract class OneShot { boolean caching() default false; } - @SuppressWarnings("DataFlowIssue") public OneShot(U universe, boolean pull) { this.universe = universe; - this.pull = pull; + this.pull = pull; } /** @@ -108,11 +114,11 @@ public DclareConfig getConfig() { * @return the ContextPool that was created */ public ContextPool getContextPool() { - return CONTEXT_POOL_POOL.getContextPool(); + return contextPoolPool().getContextPool(); } public void doneWithContextPool(ContextPool contextPool) { - if (!CONTEXT_POOL_POOL.doneWithContextPool(contextPool)) { + if (!contextPoolPool().doneWithContextPool(contextPool)) { contextPool.shutdownNow(); } } @@ -140,20 +146,21 @@ public State getEndState() { if (endState == null) { ContextPool contextPool = getContextPool(); try { - long t0 = System.nanoTime(); - StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); - ConstantState cachedConstantState = CONSTANT_STATE_CACHE.get().get(cacheKey); - boolean runningFromCache = cachedStateMap != null; + long t0 = System.nanoTime(); + StateMap cachedStateMap = STATE_MAP_CACHE.get().get(cacheKey); + ConstantState cachedConstantState = CONSTANT_STATE_CACHE.get().get(cacheKey); + boolean runningFromCache = cachedStateMap != null; UniverseTransaction universeTransaction = new UniverseTransaction(getUniverse(), contextPool, pull, getConfig(), null, cachedStateMap, cachedConstantState); - List allActions = getAllActions(runningFromCache); - trace("START", "#actions=%d", allActions.size()); + List allActions = getAllActions(runningFromCache); + TRACER.traceStart(cacheKey.getSimpleName(), allActions.size()); allActions.forEach(a -> a.putAndWaitForIdle(universeTransaction)); universeTransaction.stop(); endState = universeTransaction.waitForEnd(); if (cachedConstantState == null) { CONSTANT_STATE_CACHE.update(a -> a.computeIfAbsent(cacheKey, __ -> universeTransaction.constantState())); } - trace("DONE", "duration=%5d ms", nano2ms(System.nanoTime() - t0)); + long t1 = System.nanoTime(); + TRACER.traceDone(cacheKey.getSimpleName(), nano2ms(t1 - t0)); } finally { doneWithContextPool(contextPool); } @@ -185,48 +192,38 @@ protected MyAction(Method method, boolean runningFromCache) { throw new Error(e); } }); - isCachingMethod = method.getAnnotation(OneShotAction.class).caching(); + isCachingMethod = method.getAnnotation(OneShotAction.class).caching(); this.runningFromCache = runningFromCache; } protected void putAndWaitForIdle(UniverseTransaction universeTransaction) { - long t0 = System.nanoTime(); boolean writeResultToCache = isCachingMethod && !runningFromCache; - boolean skip = isCachingMethod && runningFromCache; + boolean skip = isCachingMethod && runningFromCache; if (skip) { - trace(" CACHE-SKIP", "%s", id()); + TRACER.traceCacheSkip(OneShot.this.cacheKey.getSimpleName(), id()); } else { - trace(" >>ACTION", "%s", id()); + TRACER.traceActionBegin(OneShot.this.cacheKey.getSimpleName(), id()); + long t0 = System.nanoTime(); State intermediateState = universeTransaction.putAndWaitForIdle(this); - traceDiff(intermediateState); if (writeResultToCache) { - long t1 = System.nanoTime(); - trace(" CACHE-WRITE", "%s", id()); + TRACER.traceCacheWrite(OneShot.this.cacheKey.getSimpleName(), id()); STATE_MAP_CACHE.update(a -> a.computeIfAbsent(cacheKey, __ -> intermediateState.getStateMap())); } - long overallNano = System.nanoTime() - t0; - long methodNano = durationNano(); - long dtOverall = nano2ms(overallNano); - long dtMethod = nano2ms(methodNano); - long dtRules = nano2ms(overallNano - methodNano); - trace(" < objPred = TRACE_ONE_SHOT_OBJECT == null ? s -> true : Pattern.compile(TRACE_ONE_SHOT_OBJECT).asPredicate(); - Predicate setPred = TRACE_ONE_SHOT_SETABLE == null ? s -> true : Pattern.compile(TRACE_ONE_SHOT_SETABLE).asPredicate(); - System.err.println("******************************State*************************************"); - System.err.println(intermediateState.universeTransaction().emptyState().diffString(intermediateState, o -> objPred.test(o.toString()), s -> s.isTraced() && setPred.test(s.toString()))); - System.err.println("************************************************************************"); + long t1 = System.nanoTime(); + long overallNano = t1 - t0; + long methodNano = durationNano(); + long dtOverall = nano2ms(overallNano); + long dtMethod = nano2ms(methodNano); + long dtRules = nano2ms(overallNano - methodNano); + TRACER.traceActionEnd(OneShot.this.cacheKey.getSimpleName(), id(), dtOverall, dtMethod, dtRules); } } } + @SuppressWarnings("DataFlowIssue") private static Set getAllMethodsOf(Class clazz) { return ALL_METHODS_CACHE.updateAndGet(a -> a.computeIfAbsent(clazz, __ -> { - Set methods = computeAllMethodsOf(clazz); + Set methods = computeAllMethodsOf(clazz); List cachingMethods = methods.filter(m -> m.getAnnotation(OneShotAction.class).caching()).map(Method::getName).asList(); if (1 < cachingMethods.count()) { throw new IllegalStateException("the oneshot " + clazz.getSimpleName() + " has too many caching actions: " + cachingMethods.collect(Collectors.joining(", "))); @@ -240,10 +237,10 @@ private static Set computeAllMethodsOf(Class clazz) { for (Class c = clazz; c != Object.class; c = c.getSuperclass()) { for (Method m : c.getDeclaredMethods()) { if (m.isAnnotationPresent(OneShotAction.class) // - && m.getParameterCount() == 0// - && m.getReturnType().equals(void.class)// - && Modifier.isPublic(m.getModifiers())// - && !map.containsKey(m.getName())) {// + && m.getParameterCount() == 0// + && m.getReturnType().equals(void.class)// + && Modifier.isPublic(m.getModifiers())// + && !map.containsKey(m.getName())) {// map = map.put(m.getName(), m); } } @@ -251,26 +248,19 @@ private static Set computeAllMethodsOf(Class clazz) { return map.toValues().asSet(); } - private void trace(String what, String format, Object... args) { - if (TRACE_ONE_SHOT) { - System.err.printf("TRACE_ONE_SHOT: %-14s %-40s - %s\n", what, cacheKey.getSimpleName(), String.format(format, args)); - } - } - private static long nano2ms(long nano) { return nano / 1_000_000; } private static class ContextPoolPool { - private static final boolean NO_POOL_POOL_TRACE = Boolean.getBoolean("NO_POOL_POOL_TRACE"); - private static final int POOL_POOL_SIZE = Integer.getInteger("POOL_POOL_SIZE", Collection.PARALLELISM); - private static final int POOL_POOL_ALARM_THRESHOLD_SEC = Integer.getInteger("POOL_POOL_ALARM_THRESHOLD_SEC", 30); - private static final int POOL_POOL_AQUIRE_TIMEOUT_SEC = Integer.getInteger("POOL_POOL_AQUIRE_TIMEOUT_SEC", 30); - private static final int POOL_POOL_MONITOR_INTERVAL_SEC = Integer.getInteger("POOL_POOL_MONITOR_INTERVAL_SEC", 60); - // - private final BlockingDeque idleQueue = new LinkedBlockingDeque<>(makePools()); - private final BlockingDeque busyQueue = new LinkedBlockingDeque<>(); - private final AtomicReference poolPoolInfo = new AtomicReference<>(new PoolPoolInfo()); + private static final int POOL_POOL_SIZE = Integer.getInteger("POOL_POOL_SIZE", Collection.PARALLELISM); + private static final int POOL_POOL_ALARM_THRESHOLD_SEC = Integer.getInteger("POOL_POOL_ALARM_THRESHOLD_SEC", 30); + private static final int POOL_POOL_AQUIRE_TIMEOUT_SEC = Integer.getInteger("POOL_POOL_AQUIRE_TIMEOUT_SEC", 30); + private static final int POOL_POOL_MONITOR_INTERVAL_SEC = Integer.getInteger("POOL_POOL_MONITOR_INTERVAL_SEC", 60); + + private final BlockingDeque idleQueue = new LinkedBlockingDeque<>(makePools()); + private final BlockingDeque busyQueue = new LinkedBlockingDeque<>(); + private final AtomicReference poolPoolInfo = new AtomicReference<>(new PoolPoolInfo()); private final java.util.Map poolInfoMap; private static java.util.Collection makePools() { @@ -278,8 +268,8 @@ private static java.util.Collection makePools() { } public ContextPoolPool() { - trace("INIT"); poolInfoMap = makePoolInfoMap(); + TRACER.tracePoolPoolInit(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); new PoolPoolMonitor(this).start(); } @@ -290,18 +280,19 @@ private java.util.Map makePoolInfoMap() { public ContextPool getContextPool() { try { PoolPoolInfo.preUpdate(poolPoolInfo); - trace("get"); - long t0 = System.nanoTime(); + TRACER.tracePoolPoolGet(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); + long t0 = System.nanoTime(); PoolInfo info = idleQueue.pollFirst(POOL_POOL_AQUIRE_TIMEOUT_SEC, TimeUnit.SECONDS); - long dt = (System.nanoTime() - t0) / 1_000_000; + long t1 = System.nanoTime(); + long dt = nano2ms(t1 - t0); if (info == null) { - trace("timeout"); + TRACER.tracePoolPoolTimeout(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); throw new RuntimeException("timeout after " + dt + " ms while waiting for ContextPool"); } PoolPoolInfo.postUpdate(poolPoolInfo, dt); info.start(); busyQueue.addFirst(info); - trace(String.format("waited %6d ms", dt)); + TRACER.tracePoolPoolWaited(Thread.currentThread().getName(), dt, idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); return info.pool; } catch (InterruptedException e) { throw new RuntimeException("interrupted while waiting for ContextPool", e); @@ -314,27 +305,21 @@ public boolean doneWithContextPool(ContextPool pool) { return false; } if (!busyQueue.remove(info)) { - trace("pool not busy"); - throw new IllegalStateException("pool not busy"); + TRACER.tracePoolPoolNotBusy(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); + throw new IllegalStateException("PP_NOT_BUSY"); } info.stop(); idleQueue.addFirst(info); - trace("done"); + TRACER.tracePoolPoolDone(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); return true; } - private void trace(String msg) { - if (!NO_POOL_POOL_TRACE) { - System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", Thread.currentThread().getName(), msg, idleQueue.size(), busyQueue.size(), poolPoolInfo.get()); - } - } - private void check() { for (PoolInfo info : poolInfoMap.values()) { if (info.busy) { long duration = info.duration(); if (POOL_POOL_ALARM_THRESHOLD_SEC * 1000L < duration) { - System.err.printf("ALARM: ContextPool probably stuck (busy for %-8d ms): %s\n", duration, info.pool); + TRACER.tracePoolPoolAlarmStuck(Thread.currentThread().getName(), idleQueue.size(), busyQueue.size(), poolPoolInfo.get(), duration, info.pool.toString()); } } } @@ -352,12 +337,12 @@ private PoolPoolMonitor(ContextPoolPool contextPoolPool) { @SuppressWarnings("BusyWait") @Override public void run() { - for (;;) { + for (; ; ) { try { Thread.sleep(POOL_POOL_MONITOR_INTERVAL_SEC * 1000L); contextPoolPool.check(); } catch (InterruptedException e) { - System.err.println("WARNING PoolPoolMonitor interrupted!"); + TRACER.tracePoolPoolMonitorQuit(); return; } } @@ -366,9 +351,9 @@ public void run() { private static class PoolInfo { private final ContextPool pool; - private boolean busy; - private long startTick; - private long lastDuration; + private boolean busy; + private long startTick; + private long lastDuration; public PoolInfo() { pool = ContextThread.createPool(); @@ -380,15 +365,15 @@ public PoolInfo() { } public void start() { - busy = true; + busy = true; lastDuration = 0; - startTick = System.currentTimeMillis(); + startTick = System.currentTimeMillis(); } public void stop() { - busy = false; + busy = false; lastDuration = duration(); - startTick = 0; + startTick = 0; } public long duration() { @@ -397,51 +382,39 @@ public long duration() { } } - private static class PoolPoolInfo { - private final long gets; - private final long immediates; - private final long waits; - private final long totalWaitTime; - private final long maxWaitTime; - - public PoolPoolInfo() { - this.gets = 0; - this.immediates = 0; - this.waits = 0; - this.totalWaitTime = 0; - this.maxWaitTime = 0; - } + } - public static void preUpdate(AtomicReference poolPoolInfo) { - update(poolPoolInfo, info -> new PoolPoolInfo(info.gets + 1, info.immediates, info.waits, info.totalWaitTime, info.maxWaitTime)); - } + public record PoolPoolInfo(long gets, + long immediates, + long waits, + long totalWaitTime, + long maxWaitTime) { + public PoolPoolInfo() { + this(0, 0, 0, 0, 0); + } - public static void postUpdate(AtomicReference poolPoolInfo, long dt) { - update(poolPoolInfo, info -> new PoolPoolInfo(info.gets, info.immediates + (0 == dt ? 1 : 0), info.waits + (0 == dt ? 0 : 1), info.totalWaitTime + dt, Math.max(info.maxWaitTime, dt))); - } + public static void preUpdate(AtomicReference poolPoolInfo) { + update(poolPoolInfo, info -> new PoolPoolInfo(info.gets + 1, info.immediates, info.waits, info.totalWaitTime, info.maxWaitTime)); + } - private static void update(AtomicReference poolPoolInfo, Function f) { - for (;;) { - PoolPoolInfo oldInfo = poolPoolInfo.get(); - PoolPoolInfo newInfo = f.apply(oldInfo); - if (poolPoolInfo.compareAndSet(oldInfo, newInfo)) { - break; - } - } - } + public static void postUpdate(AtomicReference poolPoolInfo, long dt) { + update(poolPoolInfo, info -> new PoolPoolInfo(info.gets, info.immediates + (0 == dt ? 1 : 0), info.waits + (0 == dt ? 0 : 1), info.totalWaitTime + dt, Math.max(info.maxWaitTime, dt))); + } - private PoolPoolInfo(long gets, long immediates, long waits, long totalWaitTime, long maxWaitTime) { - this.gets = gets; - this.immediates = immediates; - this.waits = waits; - this.totalWaitTime = totalWaitTime; - this.maxWaitTime = maxWaitTime; + private static void update(AtomicReference poolPoolInfo, Function f) { + for (; ; ) { + PoolPoolInfo oldInfo = poolPoolInfo.get(); + PoolPoolInfo newInfo = f.apply(oldInfo); + if (poolPoolInfo.compareAndSet(oldInfo, newInfo)) { + break; + } } + } - @Override - public String toString() { - return String.format("%4d gets (%4d immediates %4d waits %8d ms totalWait, %8d ms max-wait)", gets, immediates, waits, totalWaitTime, maxWaitTime); - } + @SuppressWarnings("NullableProblems") + @Override + public String toString() { + return String.format("%4d gets (%4d immediates %4d waits %8d ms totalWait, %8d ms max-wait)", gets, immediates, waits, totalWaitTime, maxWaitTime); } } } diff --git a/src/main/java/org/modelingvalue/dclare/OneShotTracer.java b/src/main/java/org/modelingvalue/dclare/OneShotTracer.java new file mode 100644 index 00000000..4084adc1 --- /dev/null +++ b/src/main/java/org/modelingvalue/dclare/OneShotTracer.java @@ -0,0 +1,132 @@ +package org.modelingvalue.dclare; + +import org.modelingvalue.dclare.OneShot.PoolPoolInfo; + +public interface OneShotTracer { + boolean TRACE_ONE_SHOT = Boolean.getBoolean("TRACE_ONE_SHOT"); + boolean NO_POOL_POOL_TRACE = Boolean.getBoolean("NO_POOL_POOL_TRACE"); + + void traceStart(String oneShotName, int numActions); + + void traceDone(String oneShotName, long durationMs); + + void traceCacheSkip(String oneShotName, Object actionId); + + void traceActionBegin(String oneShotName, Object actionId); + + void traceCacheWrite(String oneShotName, Object actionId); + + void traceActionEnd(String oneShotName, Object actionId, long overallMs, long methodMs, long rulesMs); + + void tracePoolPoolInit(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolGet(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolTimeout(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolWaited(String threadName, long waitedMs, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolNotBusy(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolDone(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo); + + void tracePoolPoolAlarmStuck(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo, long durationMs, String poolName); + + void tracePoolPoolMonitorQuit(); + + class ToStderr implements OneShotTracer { + @Override + public void traceStart(String oneShotName, int numActions) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - #actions=%d\n", "START", oneShotName, numActions); + } + } + + @Override + public void traceDone(String oneShotName, long durationMs) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - duration=%5d ms\n", "DONE", oneShotName, durationMs); + } + } + + @Override + public void traceCacheSkip(String oneShotName, Object actionId) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - %s\n", "CACHE-SKIP", oneShotName, actionId); + } + } + + @Override + public void traceActionBegin(String oneShotName, Object actionId) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - %s\n", "ACTION-BEGIN", oneShotName, actionId); + } + } + + @Override + public void traceCacheWrite(String oneShotName, Object actionId) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - %s\n", "CACHE-WRITE", oneShotName, actionId); + } + } + + @Override + public void traceActionEnd(String oneShotName, Object actionId, long overallMs, long methodMs, long rulesMs) { + if (TRACE_ONE_SHOT) { + System.err.printf("TRACE_ONE_SHOT: %-12s %-40s - %-25s took %5d ms (m+r=%5d + %5d)\n", "ACTION-END", oneShotName, actionId, overallMs, methodMs, rulesMs); + } + } + + @Override + public void tracePoolPoolInit(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", threadName, "PP_INIT", idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolGet(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", threadName, "PP_GET", idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolTimeout(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", threadName, "PP_TIMEOUT", idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolWaited(String threadName, long waitedMs, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] waited %6d ms : idle/busy=%3d/%3d: %s\n", threadName, waitedMs, idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolNotBusy(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", threadName, "PP_NOT_BUSY", idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolDone(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo) { + if (!NO_POOL_POOL_TRACE) { + System.err.printf("TRACE: ContextPoolPool: [%-25s] %-25s: idle/busy=%3d/%3d: %s\n", threadName, "PP_DONE", idleCount, busyCount, poolPoolInfo); + } + } + + @Override + public void tracePoolPoolAlarmStuck(String threadName, int idleCount, int busyCount, PoolPoolInfo poolPoolInfo, long durationMs, String poolName) { + System.err.printf("ALARM: ContextPool probably stuck (busy for %-8d ms): %s\n", durationMs, poolName); + } + + @Override + public void tracePoolPoolMonitorQuit() { + System.err.print("ALARM: PoolPool monitor interupted and quit\n"); + } + } +} From b02f9adfd1867b6afa3f50d81ca9ecaf7e922828 Mon Sep 17 00:00:00 2001 From: automation Date: Fri, 6 Mar 2026 19:08:52 +0000 Subject: [PATCH 175/179] [no-ci] updated by mvgplugin --- .../modelingvalue/dclare/OneShotTracer.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/org/modelingvalue/dclare/OneShotTracer.java b/src/main/java/org/modelingvalue/dclare/OneShotTracer.java index 4084adc1..f3b464c0 100644 --- a/src/main/java/org/modelingvalue/dclare/OneShotTracer.java +++ b/src/main/java/org/modelingvalue/dclare/OneShotTracer.java @@ -1,3 +1,23 @@ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~ +// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~ +// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~ +// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~ +// specific language governing permissions and limitations under the License. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + package org.modelingvalue.dclare; import org.modelingvalue.dclare.OneShot.PoolPoolInfo; From 0ae980dbdda99974d206bf6bef8ba93c6062b1aa Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Mon, 9 Mar 2026 08:21:50 +0100 Subject: [PATCH 176/179] fix memory leak due to unstopped ConstantStates --- src/main/java/org/modelingvalue/dclare/ConstantState.java | 2 +- .../java/org/modelingvalue/dclare/UniverseTransaction.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/modelingvalue/dclare/ConstantState.java b/src/main/java/org/modelingvalue/dclare/ConstantState.java index 9dc2d488..1a2eb97b 100644 --- a/src/main/java/org/modelingvalue/dclare/ConstantState.java +++ b/src/main/java/org/modelingvalue/dclare/ConstantState.java @@ -289,7 +289,7 @@ public ConstantState(String name, Consumer errorHandler) { } } } - }, "ConstantState.remover"); + }, "ConstantState.remover-" + name); remover.setDaemon(true); remover.start(); } diff --git a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java index 028cd229..d64de13e 100644 --- a/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java +++ b/src/main/java/org/modelingvalue/dclare/UniverseTransaction.java @@ -312,6 +312,9 @@ public void run() { stop(); history = history.append(state); constantState.stop(); + if (pullConstantState != null) { + pullConstantState.stop(); + } end(state); //TODO wire onto MoodManager stopped = true; //TODO wire onto MoodManager setStoppedMood(state); @@ -467,6 +470,10 @@ protected State run(State state) { } while (priority != null); return state; } finally { + if (tmpConstants != null) { + tmpConstants.stop(); + tmpConstants = null; + } postState = null; preStartStates.setState(emptyState); startStates.setState(emptyState); From fa23fbb278ade8b1554c70d8ec6a28509890afd2 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Wed, 25 Mar 2026 16:35:21 +0100 Subject: [PATCH 177/179] bump gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a..c61a118f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0262dcbd..739907df 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 0d3f52fb715cd836753ea525a1bbeeedf6c28a30 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Wed, 20 May 2026 09:43:17 +0200 Subject: [PATCH 178/179] update gradle --- gradle/wrapper/gradle-wrapper.jar | Bin 48966 -> 48462 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++- gradlew | 2 +- gradlew.bat | 31 ++++++++--------------- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60f4cff0e7451d19d49a82fa986695d07..b1b8ef56b44f16b14dc800fa8103a6d89abb526f 100644 GIT binary patch delta 39760 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 e(*aw}>J`&Ep$5$o2mVP)i30-M3~u@DBh0 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 delta 40115 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 e{Sg5G5zENPNVU~b5#<2@M#Os+0czL&{q{eZe&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% From dd1e5ec7b94d299b966a7bfb243bb4c5e5f950b8 Mon Sep 17 00:00:00 2001 From: Tom Brus Date: Thu, 21 May 2026 23:01:21 +0200 Subject: [PATCH 179/179] prepare for release 6.0.0 --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7aef38c2..503a2cbc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,8 +28,8 @@ plugins { eclipse } dependencies { - implementation("org.modelingvalue:immutable-collections:4.1.0-BRANCHED") - implementation("org.modelingvalue:mvg-json:4.1.0-BRANCHED") + implementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED") + implementation("org.modelingvalue:mvg-json:6.0.0-BRANCHED") } publishing { publications { diff --git a/gradle.properties b/gradle.properties index 410a7699..4f6dada8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ # suppress inspection "UnusedProperty" for whole file group = org.modelingvalue artifact = dclare -version = 5.1.0 +version = 6.0.0 version_java = 21