From 87b8ebcdbc7969bbc06f4e5dbe2434c6fb9a321c Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 4 Dec 2015 17:03:35 +0100
Subject: [PATCH] Switch to using abstract IAtomLogical for interfacing

---
 .../typesystem2/samplechecker/handle/util.mps | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index a572b312..5c995c59 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -16,6 +16,7 @@
     <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.constraint)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
     <import index="95zw" ref="r:f3ff7852-b9dd-4760-b213-a8a031c77d0e(jetbrains.mps.logic.jchr.predicate)" />
+    <import index="45ys" ref="r:7365f7fe-12e6-4229-8901-f6dc6d5df03f(jetbrains.mps.logic.reactor.logical)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -255,20 +256,20 @@
       <property role="TrG5h" value="findLub" />
       <node concept="37vLTG" id="5H6hZahmlpn" role="3clF46">
         <property role="TrG5h" value="result" />
-        <node concept="3uibUv" id="5H6hZahmlpB" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfpryG" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="5H6hZahmlpH" role="3clF46">
         <property role="TrG5h" value="left" />
-        <node concept="3uibUv" id="5H6hZahmlqj" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfpr$x" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="5H6hZahmlpT" role="3clF46">
         <property role="TrG5h" value="right" />
-        <node concept="3uibUv" id="5H6hZahmlqy" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfprDG" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="5H6hZahmlpi" role="3clF45" />
@@ -286,11 +287,11 @@
                   <ref role="3cqZAo" node="5H6hZahmlpH" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHhL" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                  <ref role="37wK5l" to="yg8f:dfChU1eNVy" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXjZHhM" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
               </node>
             </node>
           </node>
@@ -307,11 +308,11 @@
                   <ref role="3cqZAo" node="5H6hZahmlpT" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHhT" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                  <ref role="37wK5l" to="yg8f:dfChU1eNVy" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXjZHhU" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
               </node>
             </node>
           </node>
@@ -352,7 +353,7 @@
                 <ref role="1Pybhc" to="rchb:5uFPQ7BvN_d" resolve="EvaluationSession" />
               </node>
               <node concept="liA8E" id="5uFPQ7ClQgu" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:5uFPQ7ClOzA" resolve="computingSession" />
+                <ref role="37wK5l" to="rchb:5uFPQ7ClOzA" resolve="sessionSolver" />
               </node>
             </node>
           </node>
@@ -1649,20 +1650,20 @@
       <property role="TrG5h" value="findSubtypingPath" />
       <node concept="37vLTG" id="3KV3FXk1fGz" role="3clF46">
         <property role="TrG5h" value="result" />
-        <node concept="3uibUv" id="3KV3FXk1fGJ" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfpnPp" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXk1fGZ" role="3clF46">
         <property role="TrG5h" value="fullPaths" />
-        <node concept="3uibUv" id="3KV3FXk1fHd" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfpnRk" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="37vLTG" id="3KV3FXk1fHy" role="3clF46">
         <property role="TrG5h" value="startFrom" />
-        <node concept="3uibUv" id="3KV3FXk1fHM" role="1tU5fm">
-          <ref role="3uigEE" to="oy3s:4U_yxogAknZ" resolve="AtomLogical" />
+        <node concept="3uibUv" id="1sCZQVfpnWP" role="1tU5fm">
+          <ref role="3uigEE" to="yg8f:dfChU1jXdE" resolve="IAtomLogical" />
         </node>
       </node>
       <node concept="10P_77" id="3KV3FXk1j6w" role="3clF45" />
@@ -1680,11 +1681,11 @@
                   <ref role="3cqZAo" node="3KV3FXk1fGZ" resolve="fullPaths" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1h3Y" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                  <ref role="37wK5l" to="yg8f:dfChU1eNVy" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXk1h3Z" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
               </node>
             </node>
           </node>
@@ -1701,11 +1702,11 @@
                   <ref role="3cqZAo" node="3KV3FXk1fHy" resolve="startFrom" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1iAo" role="2OqNvi">
-                  <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
+                  <ref role="37wK5l" to="yg8f:dfChU1eNVy" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXk1iAp" role="2OqNvi">
-                <ref role="37wK5l" to="95zw:3HJTsBmBZ0h" resolve="value" />
+                <ref role="37wK5l" to="45ys:1mP5b6jQPMI" resolve="value" />
               </node>
             </node>
           </node>
@@ -1746,7 +1747,7 @@
                 <ref role="37wK5l" to="rchb:5uFPQ7Bwt5n" resolve="current" />
               </node>
               <node concept="liA8E" id="5uFPQ7ClVCO" role="2OqNvi">
-                <ref role="37wK5l" to="rchb:5uFPQ7ClOzA" resolve="computingSession" />
+                <ref role="37wK5l" to="rchb:5uFPQ7ClOzA" resolve="sessionSolver" />
               </node>
             </node>
           </node>