minor fixes, prototyped DynamiclySolvedEXP

Assets/Plugins/EasyRoads3D/images/Thumbs.db.meta

-fileFormatVersion: 2
-guid: 903066108a5d14444b8c9ffda790e310
-timeCreated: 1471875076
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/InteractionEngine/CommunicationEvents.cs

@@ -54,6 +54,8 @@ public class AnimationEventWithUris : UnityEvent<List<string>> { }
     //TODO? [SolutionManager, List<[HashSet<string>, FactComparer]>]
     public static List<Fact> Solution = new List<Fact>();
 
+    public static (FactOrganizer, List<(HashSet<string>, FactComparer)>) SolutionSet;
+
     public static bool ServerRunning = true;
     public static string ServerAdress = "localhost:8085";
 

Assets/Scripts/InteractionEngine/Fact.cs

@@ -388,7 +388,7 @@ public override Boolean hasDependentFacts() {
     }
 
     public override string[] getDependentFactIds() {
-        return new string[] { }; ;
+        return new string[] { };
     }
 
     public override GameObject instantiateDisplay(GameObject prefab, Transform transform) {
@@ -405,7 +405,7 @@ public override int GetHashCode()
 
     protected override bool EquivalentWrapped(PointFact f1, PointFact f2)
     {
-        return f1.Point == f2.Point;
+        return Math3d.IsApproximatelyEqual(f1.Point, f2.Point);
     }
 
 }

Assets/Scripts/InteractionEngine/FactOrganizer.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using System;
 
-//TODO? PERF? (often inserts) SortedDict <-> Dict (often reads)
 //TODO: MMT: move some functionality there
 //TODO: consequent!= samestep != dependent
 
@@ -547,6 +546,38 @@ public bool DynamiclySolved(List<Fact> MinimalSolution, out List<Fact> MissingEl
         return MissingElements.Count == 0;
     }
 
+    //TODO: repair
+    public bool DynamiclySolvedEXP(
+        (FactOrganizer solutionorganizer, List<(HashSet<string> subsolution, FactComparer comparer)> validationsets) MinimalSolution,
+        out List<List<string>> MissingElements,
+        out List<List<string>> Solutions)
+    {
+        MissingElements = new List<List<string>>();
+        Solutions = new List<List<string>>();
+
+        int MissingElementsCount = 0;
+        var activeList = FactDict.Values.Where(f => MetaInf[f.Id].active);
+
+        foreach (var ValidationSet in MinimalSolution.validationsets)
+        {
+            var part_minimal = 
+                ValidationSet.subsolution.Select(URI => MinimalSolution.solutionorganizer[URI]);
+
+            var part_solution =
+                activeList.Where(active => part_minimal.Contains(active, ValidationSet.comparer.SetSearchRight()));
+
+            var part_missing =
+                part_minimal.Except(part_solution, ValidationSet.comparer.SetSearchLeft());
+
+            Solutions.Add(part_solution.Select(fact => fact.Id).ToList());
+            MissingElements.Add(part_missing.Select(fact => fact.Id).ToList());
+
+            MissingElementsCount += part_missing.Count();
+        }
+
+        return MissingElementsCount == 0;
+    }
+
 }
 
 

Assets/Scripts/Level.cs

@@ -24,17 +24,29 @@ void Start()
         LineFact target = new LineFact(buttom.Id, top.Id, SolutionManager);
         Solution.Add(SolutionManager[SolutionManager.Add(target, out _, true)]);
         Fact.Clear();
+
+        SolutionSet = (SolutionManager,
+            new List<(HashSet<string>, FactComparer)> 
+            { (new HashSet<string> { target.Id, buttom.Id }, new LineFactHightDirectionComparer()) });
     }
 
     public static bool gameSolved()
     {
         bool solved =
             LevelFacts.DynamiclySolved(Solution, out _, out List<Fact> hits, FactComparer: new LineFactHightDirectionComparer());
+        bool solvedEXP =
+            LevelFacts.DynamiclySolvedEXP(SolutionSet, out _, out List<List<string>> hitsEXP);
+
 
         if (solved)
             foreach (var hit in hits)
                 AnimateExistingFactEvent.Invoke(hit);
 
+        if (solvedEXP)
+            foreach (var hitlist in hitsEXP)
+                foreach(var hit in hitlist)
+                    AnimateExistingFactEvent.Invoke(LevelFacts[hit]);
+
         return solved;
     }
 

Assets/Scripts/Math3d.cs

@@ -556,6 +556,12 @@ public static bool IsApproximatelyParallel(Vector3 vectorA, Vector3 vectorB, dou
              < precission;
     }
 
+    //This function returns true if two Vector3s are approximately Equal
+    public static bool IsApproximatelyEqual(Vector3 vectorA, Vector3 vectorB, double precission = Math3d.vectorPrecission)
+    {
+        return (vectorA - vectorB).sqrMagnitude < precission;
+    }
+
     //This function returns a point which is a projection from a point to a line segment.
     //If the projected point lies outside of the line segment, the projected point will 
     //be clamped to the appropriate line edge.

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2020.3.15f2
-m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)
+m_EditorVersion: 2020.3.16f1
+m_EditorVersionWithRevision: 2020.3.16f1 (049d6eca3c44)