web search done right
more structure
Mikkel Denker0dc108772ca2
diff --git a/src/lib.rs b/src/lib.rsindex 5fafcc58..2627fb67 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -5,7 +5,7 @@ use thiserror::Error;mod indexer;mod query;-mod ranker;+mod ranking;mod search_index;mod searcher;mod warc;diff --git a/src/ranker.rs b/src/ranker.rsdeleted file mode 100644index 9e7ef8b2..00000000--- a/src/ranker.rs+++ /dev/null@@ -1 +0,0 @@-pub(crate) struct Ranker {}diff --git a/src/ranking/bm25.rs b/src/ranking/bm25.rsnew file mode 100644index 00000000..84196268--- /dev/null+++ b/src/ranking/bm25.rs@@ -0,0 +1,10 @@+use super::scorer::Scorer;+use crate::search_index::FastWebpage;++struct BM25 {}++impl Scorer for BM25 {+ fn score(&self, webpages: &[FastWebpage]) -> Vec<f64> {+ todo!()+ }+}diff --git a/src/ranking/harmonic_centrality.rs b/src/ranking/harmonic_centrality.rsnew file mode 100644index 00000000..ca42c7b0--- /dev/null+++ b/src/ranking/harmonic_centrality.rs@@ -0,0 +1,18 @@+use std::collections::HashMap;++use super::scorer::Scorer;+use crate::{search_index::FastWebpage, webgraph::Node};++struct HarmonicCentrality {}++impl From<HashMap<Node, f64>> for HarmonicCentrality {+ fn from(scores: HashMap<Node, f64>) -> Self {+ todo!()+ }+}++impl Scorer for HarmonicCentrality {+ fn score(&self, webpages: &[FastWebpage]) -> Vec<f64> {+ todo!()+ }+}diff --git a/src/ranking/mod.rs b/src/ranking/mod.rsnew file mode 100644index 00000000..c2b5e150--- /dev/null+++ b/src/ranking/mod.rs@@ -0,0 +1,6 @@+mod bm25;+mod harmonic_centrality;+mod ranker;+mod scorer;++pub(crate) use ranker::Ranker;diff --git a/src/ranking/ranker.rs b/src/ranking/ranker.rsnew file mode 100644index 00000000..18f6bcdb--- /dev/null+++ b/src/ranking/ranker.rs@@ -0,0 +1,2 @@+/// Applies scorers and ranks results+pub(crate) struct Ranker {}diff --git a/src/ranking/scorer.rs b/src/ranking/scorer.rsnew file mode 100644index 00000000..52bc5b0e--- /dev/null+++ b/src/ranking/scorer.rs@@ -0,0 +1,5 @@+use crate::search_index::FastWebpage;++pub(crate) trait Scorer {+ fn score(&self, webpages: &[FastWebpage]) -> Vec<f64>;+}diff --git a/src/search_index.rs b/src/search_index.rsindex 1e6e61e2..3ad19f5a 100644--- a/src/search_index.rs+++ b/src/search_index.rs@@ -40,6 +40,8 @@ impl Index {pub struct FastWebpage {url: String,+ doc_id: tantivy::DocId,+ bm25_score: tantivy::Score,}pub struct RetrievedWebpage {title: String,diff --git a/src/searcher.rs b/src/searcher.rsindex 4c2a62e7..81cab036 100644--- a/src/searcher.rs+++ b/src/searcher.rs@@ -1,4 +1,4 @@-use crate::{ranker::Ranker, search_index::Index};+use crate::{ranking::Ranker, search_index::Index};pub struct Searcher {index: Index,