-
-
-
-
- @_document1.Geography
-
Metadata
+ {
+
+
+
+
+
+ @_document1.Geography
+
Metadata
+
+
-
-
- }
+ }
@if (_similarity.TypeSimilarity > 0)
- {
-
-
-
-
Type (@(_similarity.TypeSimilarity * 100)%)
-
Metadata
+ {
+
+
+
+
Type (@(_similarity.TypeSimilarity * 100)%)
+ Metadata
+
+
-
-
- }
+ }
-
+
+
}
diff --git a/solution/HackTheClimate/Pages/PrecomputeSimilarity.razor b/solution/HackTheClimate/Pages/PrecomputeSimilarity.razor
index aab5879..ef31457 100644
--- a/solution/HackTheClimate/Pages/PrecomputeSimilarity.razor
+++ b/solution/HackTheClimate/Pages/PrecomputeSimilarity.razor
@@ -78,4 +78,4 @@ else{
_processing = false;
}
-}
\ No newline at end of file
+}
diff --git a/solution/HackTheClimate/Services/DocumentService.cs b/solution/HackTheClimate/Services/DocumentService.cs
index 3509a75..92f386c 100644
--- a/solution/HackTheClimate/Services/DocumentService.cs
+++ b/solution/HackTheClimate/Services/DocumentService.cs
@@ -25,7 +25,9 @@ public DocumentService(LegislationService legislationService)
public async Task
GetDetailsAsync(string id)
{
var legislation = _legislationService.GetLegislation(id);
- var topicWords = _topics.SingleOrDefault(x => x.DocumentId == id)?.TopicWords ?? new string[0];
+ var topicWords =
+ _topics.SingleOrDefault(x => x.DocumentId == id)?.Words.OrderByDescending(x => x.Score)
+ .Select(x => x.Word).ToArray() ?? new string[0];
return new DocumentDetails
{
diff --git a/solution/HackTheClimate/Services/FakeSimilarityService.cs b/solution/HackTheClimate/Services/FakeSimilarityService.cs
index 753d8b5..c13f04b 100644
--- a/solution/HackTheClimate/Services/FakeSimilarityService.cs
+++ b/solution/HackTheClimate/Services/FakeSimilarityService.cs
@@ -13,4 +13,4 @@ public SimilarityResult CalculateSimilarity(Legislation a, Legislation b)
};
}
}
-}
\ No newline at end of file
+}
diff --git a/solution/HackTheClimate/Services/SimilarityService.cs b/solution/HackTheClimate/Services/SimilarityService.cs
index 9f07de2..0715a52 100755
--- a/solution/HackTheClimate/Services/SimilarityService.cs
+++ b/solution/HackTheClimate/Services/SimilarityService.cs
@@ -14,10 +14,12 @@ public class SimilarityService
{
private static Dictionary _precomputed;
private readonly EntityRecognitionService _entityRecognitionService;
+ private readonly TopicBasedSimilarityService _topicBasedSimilarityService;
- public SimilarityService(EntityRecognitionService entityRecognitionService)
+ public SimilarityService(EntityRecognitionService entityRecognitionService, TopicBasedSimilarityService topicBasedSimilarityService)
{
_entityRecognitionService = entityRecognitionService;
+ _topicBasedSimilarityService = topicBasedSimilarityService;
}
public async Task> GetMostSimilarLegislationIds(Legislation a)
@@ -62,6 +64,7 @@ public SimilarityResult CalculateSimilarity(Legislation a, Legislation b, Simila
var entityProductSimilarity = EntityCategorySimilarity(a, b, "Product");
var entityEventSimilarity = EntityCategorySimilarity(a, b, "Event");
var entityLocationSimilarity = EntityCategorySimilarity(a, b, "Location");
+ var topicSimilarity = _topicBasedSimilarityService.CalculateSimilarity(a, b);
return new SimilarityResult
{
@@ -77,7 +80,8 @@ public SimilarityResult CalculateSimilarity(Legislation a, Legislation b, Simila
+ weights.EntityProductWeight * entityProductSimilarity.Score
+ weights.EntitySkillWeight * entitySkillSimilarity.Score
+ weights.EntityEventWeight * entityEventSimilarity.Score
- + weights.EntityLocationWeight * entityLocationSimilarity.Score)
+ + weights.EntityLocationWeight * entityLocationSimilarity.Score
+ + weights.TopicWeight * topicSimilarity.Score)
/ weights.TotalWeight(),
KeywordSimilarity = keywordSimilarity,
@@ -92,7 +96,8 @@ public SimilarityResult CalculateSimilarity(Legislation a, Legislation b, Simila
SkillEntitiesSimilarity = entitySkillSimilarity,
ProductEntitiesSimilarity = entityProductSimilarity,
EventEntitiesSimilarity = entityEventSimilarity,
- LocationEntitiesSimilarity = entityLocationSimilarity
+ LocationEntitiesSimilarity = entityLocationSimilarity,
+ TopicSimilarity = topicSimilarity
};
}
@@ -173,7 +178,8 @@ public class SimilarityResult
public ListSimilarityResult ProductEntitiesSimilarity { get; set; }
public ListSimilarityResult EventEntitiesSimilarity { get; set; }
public ListSimilarityResult LocationEntitiesSimilarity { get; set; }
+ public ListSimilarityResult TopicSimilarity { get; set; }
public int LocationSimilarity { get; set; }
public int TypeSimilarity { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/solution/HackTheClimate/Services/SimilarityWeights.cs b/solution/HackTheClimate/Services/SimilarityWeights.cs
index bac1f26..8e17522 100644
--- a/solution/HackTheClimate/Services/SimilarityWeights.cs
+++ b/solution/HackTheClimate/Services/SimilarityWeights.cs
@@ -15,10 +15,11 @@ public class SimilarityWeights
public int EntityProductWeight { get; set; }
public int EntityEventWeight { get; set; }
public int EntityLocationWeight { get; set; }
+ public int TopicWeight { get; set; }
public SimilarityWeights(int keywordWeight, int sectorWeight, int frameworkWeight, int instrumentWeight,
int naturalHazardWeight, int documentTypeWeight, int responseWeight, int locationWeight, int typeWeight,
- int entitySkillWeight, int entityProductWeight, int entityEventWeight, int entityLocationWeight)
+ int entitySkillWeight, int entityProductWeight, int entityEventWeight, int entityLocationWeight, int topicWeight)
{
KeywordWeight = keywordWeight;
SectorWeight = sectorWeight;
@@ -33,11 +34,12 @@ public SimilarityWeights(int keywordWeight, int sectorWeight, int frameworkWeigh
EntityProductWeight = entityProductWeight;
EntityEventWeight = entityEventWeight;
EntityLocationWeight = entityLocationWeight;
+ TopicWeight = topicWeight;
}
public static SimilarityWeights DefaultWeights()
{
- return new SimilarityWeights(3, 3, 3, 3, 3, 1, 3, 2, 1, 3, 4, 3, 1);
+ return new SimilarityWeights(3, 3, 3, 3, 3, 1, 3, 2, 1, 3, 4, 3, 1, 1);
}
public int TotalWeight()
@@ -54,7 +56,8 @@ public int TotalWeight()
+ EntitySkillWeight
+ EntityProductWeight
+ EntityEventWeight
- + EntityLocationWeight;
+ + EntityLocationWeight
+ + TopicWeight;
}
}
-}
\ No newline at end of file
+}
diff --git a/solution/HackTheClimate/Services/TopicBasedSimilarityService.cs b/solution/HackTheClimate/Services/TopicBasedSimilarityService.cs
new file mode 100644
index 0000000..dd1446c
--- /dev/null
+++ b/solution/HackTheClimate/Services/TopicBasedSimilarityService.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using HackTheClimate.Data;
+
+namespace HackTheClimate.Services
+{
+ public class TopicBasedSimilarityService
+ {
+ private readonly List _topics;
+
+ public TopicBasedSimilarityService()
+ {
+ var assembly = Assembly.GetExecutingAssembly();
+ using var stream = assembly.GetManifestResourceStream("HackTheClimate.Data.topics.json");
+ using var reader = new StreamReader(stream);
+ _topics = JsonSerializer.Deserialize>(reader.ReadToEnd());
+ }
+
+ public ListSimilarityResult CalculateSimilarity(Legislation a, Legislation b)
+ {
+ var aTopics = _topics.SingleOrDefault(x => x.DocumentId.Equals(a.Id));
+ var bTopics = _topics.SingleOrDefault(x => x.DocumentId.Equals(b.Id));
+
+ if (aTopics == null || bTopics == null)
+ {
+ throw new ArgumentException("Unsupported document provided");
+ }
+
+ var aDict = aTopics.Words.ToDictionary(x => x.Word, x => x.Score);
+ var bDict = bTopics.Words.ToDictionary(x => x.Word, x => x.Score);
+
+ var matches = aTopics.Words.Select(x => x.Word).Intersect(bTopics.Words.Select(x => x.Word))
+ .ToList();
+
+ return new ListSimilarityResult
+ {
+ NoMatchA = aDict.Count - matches.Count,
+ NoMatchB = bDict.Count - matches.Count,
+ Overlap = matches,
+ Score = matches.Sum(x => aDict[x] * bDict[x])
+ };
+ }
+ }
+}
diff --git a/solution/HackTheClimate/Shared/ListSimilarityResultComponent.razor b/solution/HackTheClimate/Shared/ListSimilarityResultComponent.razor
index f7db093..a6eadf1 100644
--- a/solution/HackTheClimate/Shared/ListSimilarityResultComponent.razor
+++ b/solution/HackTheClimate/Shared/ListSimilarityResultComponent.razor
@@ -1,5 +1,6 @@
@using HackTheClimate.Services
@using HackTheClimate.Data
+@using HackTheClimate.Services.Similarity
@using Microsoft.EntityFrameworkCore.Internal
diff --git a/solution/HackTheClimate/Shared/SkillEntitiesComponent.razor b/solution/HackTheClimate/Shared/SkillEntitiesComponent.razor
index a68fb6a..5eb1ead 100755
--- a/solution/HackTheClimate/Shared/SkillEntitiesComponent.razor
+++ b/solution/HackTheClimate/Shared/SkillEntitiesComponent.razor
@@ -1,5 +1,4 @@
@using HackTheClimate.Services
-@using HackTheClimate.Data
diff --git a/solution/HackTheClimate/Startup.cs b/solution/HackTheClimate/Startup.cs
index ae4f5fb..0653188 100644
--- a/solution/HackTheClimate/Startup.cs
+++ b/solution/HackTheClimate/Startup.cs
@@ -34,6 +34,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton
();
services.AddSingleton();
+ services.AddSingleton();
+
services.AddSingleton();
services.AddTransient();
@@ -64,4 +66,4 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
});
}
}
-}
\ No newline at end of file
+}
diff --git a/solution/HackTheClimate/wwwroot/diagram.js b/solution/HackTheClimate/wwwroot/diagram.js
index 8adc3c9..abeab54 100644
--- a/solution/HackTheClimate/wwwroot/diagram.js
+++ b/solution/HackTheClimate/wwwroot/diagram.js
@@ -51,10 +51,6 @@ export async function renderDiagram(element, data) {
.attr("class", "node-information")
.style("opacity", 0);
- svg.on("click", function() {
- nodeInformationDiv.transition().duration(200).style("opacity", 0);
- })
-
const onMouseOver = (function () {
return function(node) {
@@ -131,7 +127,10 @@ export async function renderDiagram(element, data) {
.attr("r", d => radiusScale(d.confidenceScore))
.attr("fill", nodeColor)
.on("click", toggleColor)
- .on("mouseover", onMouseOver)
+ .on("mouseenter", onMouseOver)
+ .on("mouseleave", function() {
+ nodeInformationDiv.transition().duration(200).style("opacity", 0);
+ })
.call(d3.drag()
.on("start", d => dragstarted(d, simulation))
.on("drag", d => dragged(d))