- New QA comparison engine added

- QAs that have more than 50% difference are discarded in comparison results

Author: Shujaat

Common/LicenseGen.cs

@@ -24,7 +24,7 @@ public override bool Equals(object obj)
       var objLI = obj as LI;
 
       return objLI.app.Trim() == this.app.Trim() &&
-            objLI.email.Trim() == this.email.Trim() &&
+            objLI.email.Trim().ToLower() == this.email.Trim().ToLower() &&
             objLI.code.Trim() == this.code.Trim();
     }
 

HFQAppKeyGen/HFQAppKeyGen.csproj

@@ -55,10 +55,10 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>15177BB220298CCBAB0E47B339BA797E80817D7C</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>63AE7E3A28B7D648F91A6236DF918692A2FEAE92</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>HFQAppKeyGen_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>HFQAppKeyGen_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -119,6 +119,7 @@
     <Resource Include="AUDIOWIDE-REGULAR.TTF">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <None Include="HFQAppKeyGen_1_TemporaryKey.pfx" />
     <None Include="HFQAppKeyGen_TemporaryKey.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -157,7 +158,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties Reactor_Deploy="0" Reactor_Output="" Reactor_Configuration="Release" Reactor_Project="" Reactor_Commands="" Reactor_Enabled="1" />
+      <UserProperties Reactor_Enabled="1" Reactor_Commands="" Reactor_Project="" Reactor_Configuration="Release" Reactor_Output="" Reactor_Deploy="0" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>

HFQOApp/MainWindow.xaml.cs

@@ -64,16 +64,24 @@ private void HFQPane_QASelected(QA qa)
     {
       try
       {
-        //scroll to the position of QA
-        var PH = DV.PageViews[0].DocumentPage.Size.Height;
-        var VH = DV.PageViews[0].ActualHeight;
+        if (qa.StartPage <= 0)
+        {
+          ViewModelLocator.DialogService.ShowMessage($"Cannot locate this QA because StartPage value for this QA is invalid. QA.StartPage = {qa.StartPage}", false);
+        }
+        else
+        {
+          //scroll to the position of QA
+          var PH = DV.PageViews[0].DocumentPage.Size.Height;
+          var VH = DV.PageViews[0].ActualHeight;
 
-        var XPSPageHeight = DV.PageViews[0].ActualHeight + DV.VerticalPageSpacing + 2;
-        var R = (qa.StartY / PH - 0.1) * VH;
+          var XPSPageHeight = DV.PageViews[0].ActualHeight + DV.VerticalPageSpacing + 2;
+          var R = (qa.StartY / PH - 0.1) * VH;
 
-        if (R < 0) R = 0;
+          if (R < 0) R = 0;
 
-        DV.VerticalOffset = (qa.StartPage - 1) * XPSPageHeight + R;
+
+          DV.VerticalOffset = (qa.StartPage - 1) * XPSPageHeight + R;
+        }
       }
       catch (Exception ee)
       {
@@ -139,7 +147,7 @@ private void AboutButton_Click(object sender, RoutedEventArgs e)
     {
       ViewModelLocatorBase.DialogService.OpenAboutWindow();
 
-      
+
     }
 
     private void DeleteXPSFile(string xpsPath)

HFQOVM/ViewModelLocator.cs

@@ -33,8 +33,8 @@ static ViewModelLocator()
       SimpleIoc.Default.Register<IHardwareHelper, HardwareHelper>();
 
 #if(DEBUG)
-      //SimpleIoc.Default.Register<ICameraService, DummyCameraService>();
-      SimpleIoc.Default.Register<ICameraService, CameraService>();      
+      SimpleIoc.Default.Register<ICameraService, DummyCameraService>();
+      //SimpleIoc.Default.Register<ICameraService, CameraService>();      
 #else
       SimpleIoc.Default.Register<ICameraService, CameraService>();      
 #endif

MultiDF.VM/DFResult.cs

@@ -39,14 +39,13 @@ public DFResultRow(int i1, int i2, double dist)
 
     public override bool Equals(object obj)
     {
-      if (obj == null || typeof(DFResultRow) != obj.GetType())
-        return false;
-      else
-      {
-        var Other = (DFResultRow)obj;
-        return (Q1.Equals(Other.Q1) && Q2.Equals(Other.Q2)) ||
-               (Q2.Equals(Other.Q1) && Q1.Equals(Other.Q2));
-      }
+      return 
+          obj != null &&
+          obj is DFResultRow other &&
+          (
+            (Q1.Equals(other.Q1) && Q2.Equals(other.Q2)) ||
+            (Q2.Equals(other.Q1) && Q1.Equals(other.Q2))
+          );
     }
 
     public override int GetHashCode()

MultiDF.VM/DefaultDocComparer.cs

@@ -10,6 +10,8 @@ namespace MultiDF.VM
 {
   public class DefaultDocComparer : IDocComparer
   {
+    private const float MAX_DIFF_THRESHOLD = 0.5f;
+
     public event Action<XMLDoc, XMLDoc> DocCompareStarted;
     public event QAComparedDelegate QACompared;
     public event Action QASkipped;
@@ -18,9 +20,9 @@ public class DefaultDocComparer : IDocComparer
     //This list will keep record of pairs of question that have been dispatched for comparison, so that
     //we do not send them for comparison again. e.g. if X and Y have been dispatched for comparison, we will
     //not dispatch the inverse pair Y and X.
-    List<DFResultRow> DispatchedItems = new List<DFResultRow>();
+    //HashSet<(QA, QA)> DispatchedItems;
 
-    public Task<DFResult> Compare(XMLDoc d1, XMLDoc d2, IQAComparer qaComparer, bool ignoreCase, CancellationToken token)
+    public DFResult Compare(XMLDoc d1, XMLDoc d2, IQAComparer qaComparer, bool ignoreCase, CancellationToken token)
     {
       DFResult Result = new DFResult(d1, d2, d1.QAs.Count, d2.QAs.Count);
 
@@ -29,76 +31,69 @@ public Task<DFResult> Compare(XMLDoc d1, XMLDoc d2, IQAComparer qaComparer, bool
 
       DocCompareStarted?.Invoke(d1, d2);
 
-      DispatchedItems.Clear();
+      //DispatchedItems = new HashSet<(QA, QA)>();
 
-      return Task.Run(() =>
+      try
       {
-        Parallel.ForEach(d1.QAs, new ParallelOptions() { CancellationToken = token },
-                q1 =>
+        var AllComparisons = Parallel.ForEach(d1.QAs, new ParallelOptions() { CancellationToken = token, MaxDegreeOfParallelism = 3 },
+          (q1) =>
+          {
+
+            foreach (var q2 in d2.QAs)
+            {
+              Interlocked.Increment(ref LoopCount);
+              var Prog = 100 * (LoopCount / TotalComparisons);
+
+              if (!q1.Equals(q2))
+              {
+                //var DFR = ProcessDFR(q1, q2, qaComparer, ignoreCase);
+
+                var DFR = new DFResultRow(q1, q2, 0);
+                DFR.Distance = qaComparer.Distance(q1, q2, ignoreCase);
+
+
+                if (DFR != null && DFR.Distance < MAX_DIFF_THRESHOLD)
                 {
-                  foreach (var q2 in d2.QAs)
-                  {
-                    var DFR = ProcessDFR(q1, q2, qaComparer, ignoreCase, token);
-                    Interlocked.Increment(ref LoopCount);
-                    var Prog = 100 * (LoopCount / TotalComparisons);
-
-                    if (DFR != null)
-                    {
-                      lock(this){
-                        Result.Items.Add(DFR.Value);
-                        QACompared?.Invoke(this, new QAComparedArgs() { QA1 = q1, QA2 = q2, Distance = DFR.Value.Distance, PercentProgress = Prog });
-                      }
-                    }
-                    else
-                      QASkipped?.Invoke();
-                   
-                    token.ThrowIfCancellationRequested();
-                  }
+                  Result.Items.Add(DFR);
+                  QACompared?.Invoke(this, new QAComparedArgs() { QA1 = q1, QA2 = q2, Distance = DFR.Distance, PercentProgress = Prog });
                 }
-              );
-      }).ContinueWith(t =>
-      {
-        if (t.Exception == null)
-        {
-          DocCompareCompleted?.Invoke(d1, d2);
-          return Result;
-        }
-        else
-          throw t.Exception;
-      });
-    }
+                else
+                  QASkipped?.Invoke();
 
+                token.ThrowIfCancellationRequested();
+              }
+            }
 
-    private DFResultRow? ProcessDFR(QA q1, QA q2, IQAComparer qaComparer, bool ignoreCase, CancellationToken token)
-    {
-      if (q1 != q2)
+            ViewModelLocator.Main.RaisePropertyChanged(nameof(MainVM.ElapsedTime));
+            ViewModelLocator.Main.RaisePropertyChanged(nameof(MainVM.EstimatedRemainingTime));
+          });
+      }
+      finally
       {
-        var DFR = new DFResultRow(q1, q2, 0);
-
-        var Flag = false;
+        DocCompareCompleted?.Invoke(d1, d2);
+      }
 
-        lock (DispatchedItems)
-        {
-          if (!DispatchedItems.Any(i => i.Equals(DFR)))
-          {
-            DispatchedItems.Add(DFR);
-            Flag = true;
-          }
-        }
-
-        if (Flag)
-        {
-          if (!token.IsCancellationRequested)
-          {
-            DFR.Distance = qaComparer.Distance(q1, q2, ignoreCase);
+      return Result;
+    }
 
-            if (!token.IsCancellationRequested)
-              return DFR;
-          }
-        }
-      }
+    private DFResultRow? ProcessDFR(QA q1, QA q2, IQAComparer qaComparer, bool ignoreCase)
+    {
+      //if (!DispatchedItems.Contains((q1, q2)))
+      //{
+      //  lock (DispatchedItems)
+      //  {
+      //    DispatchedItems.Add((q1, q2));
+      //  }
 
-      return null;
+      var DFR = new DFResultRow(q1, q2, 0);
+      DFR.Distance = qaComparer.Distance(q1, q2, ignoreCase);
+      return DFR;
+      //}
+      //else
+      //{
+      //  System.Diagnostics.Debug.Print("Already dispatched");
+      //  return null;
+      //}
     }
   }
 }

MultiDF.VM/DefaultQAExtractionStrategy.cs

@@ -178,6 +178,7 @@ private QA ExtractNextQA(List<WordParagraph> paragraphs, ref int i)
               {
                 state = QAExtractionState.Choices;
                 QA.Choices.Add(paragraphs[i].Text);
+                QA.ChoicesUpper.Add(paragraphs[i].Text.ToUpperInvariant());
               }
               else if (NormalizedText.Contains("answer area:"))
               {
@@ -197,6 +198,7 @@ private QA ExtractNextQA(List<WordParagraph> paragraphs, ref int i)
               if (paragraphs[i].Type == ParagraphType.NumberedList || paragraphs[i].Type == ParagraphType.TableRow)
               {
                 QA.Choices.Add(paragraphs[i].Text);
+                QA.ChoicesUpper.Add(paragraphs[i].Text.ToUpperInvariant());
               }
               else
               {

MultiDF.VM/DiffVM.cs

@@ -47,7 +47,7 @@ public DiffVM()
             var Acopy = new List<string>(args.a1);
             var Bcopy = new List<string>(args.a2);
 
-            MinDistanceSort.Sort(Acopy, Bcopy, Levenshtein.CalcLevenshteinDistanceIgnoreCase);
+            MinDistanceSort.Sort(Acopy, Bcopy, true, Fastenshtein.Levenshtein.Distance);
 
             var Result2 = diff2.BuildDiffModel(string.Join(Environment.NewLine, Acopy), string.Join(Environment.NewLine, Bcopy), false);
 

MultiDF.VM/Interfaces/IDocComparer.cs

@@ -18,7 +18,7 @@ public class QAComparedArgs : EventArgs
 
   public interface IDocComparer
   {
-    Task<DFResult> Compare(XMLDoc d1, XMLDoc d2, IQAComparer qaComparer, bool ignoreCase, CancellationToken token);
+    DFResult Compare(XMLDoc d1, XMLDoc d2, IQAComparer qaComparer, bool ignoreCase, CancellationToken token);
 
     event Action<XMLDoc, XMLDoc> DocCompareStarted;
     event QAComparedDelegate QACompared;