Rollback some changes and merge from hotfix/implementations

integratedmodelling · Dec 3, 2024 · 3442162 · 3442162
1 parent 83aec9b
commit 3442162
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 410 deletions.
diff --git a/klab.cli/src/main/java/org/integratedmodelling/cli/KlabCLI.java b/klab.cli/src/main/java/org/integratedmodelling/cli/KlabCLI.java
@@ -9,6 +9,8 @@
 import org.integratedmodelling.klab.api.engine.Engine;
 import org.integratedmodelling.klab.api.exceptions.KlabIOException;
 import org.integratedmodelling.klab.api.exceptions.KlabIllegalStateException;
+import org.integratedmodelling.klab.api.scope.ContextScope;
+import org.integratedmodelling.klab.api.scope.Scope;
 import org.integratedmodelling.klab.api.scope.Scope.Status;
 import org.integratedmodelling.klab.api.scope.SessionScope;
 import org.integratedmodelling.klab.api.scope.UserScope;

diff --git a/klab.cli/src/main/java/org/integratedmodelling/cli/views/CLIReasonerView.java b/klab.cli/src/main/java/org/integratedmodelling/cli/views/CLIReasonerView.java
@@ -8,6 +8,7 @@
 import org.integratedmodelling.klab.api.knowledge.DescriptionType;
 import org.integratedmodelling.klab.api.knowledge.SemanticType;
 import org.integratedmodelling.klab.api.scope.ContextScope;
+import org.integratedmodelling.klab.api.services.Reasoner;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
@@ -169,6 +170,17 @@ public void run() {
             }
         }
     }
+
+
+    @Command(name = "compatible", mixinStandardHelpOptions = true, version = Version.CURRENT, description = {
+            "Check if two concepts are compatible, optionally in context."}, subcommands = {})
+    public static class Compatible implements Runnable {
+
+        @Spec
+        CommandSpec commandSpec;
+
+        @Parameters
+        java.util.List<String> arguments;
         @Override
         public void run() {
 

diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlActuator.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlActuator.java
diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlComputation.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlComputation.java
diff --git a/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlContextualizer.java b/klab.core.api/src/main/java/org/integratedmodelling/klab/api/lang/kdl/KdlContextualizer.java