Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jhellerstein committed Sep 26, 2024
1 parent d1309a0 commit 6a17c47
Showing 1 changed file with 0 additions and 86 deletions.
86 changes: 0 additions & 86 deletions lattices/src/ght_lattice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@ use crate::{IsBot, IsTop, LatticeBimorphism, LatticeOrd, Merge};
/// Lattice traits for GHT
//////////////////////////

/// Merge
// impl<KeyType, Inner> Merge<GHT<KeyType, Inner>> for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt,
// Inner: GeneralizedHashTrieNode + Merge<Inner>,
// {
// fn merge(&mut self, other: GHT<KeyType, Inner>) -> bool {
// self.trie.merge(other.trie)
// }
// }

impl<Head, Node> Merge<GhtInner<Head, Node>> for GhtInner<Head, Node>
where
Node: GeneralizedHashTrieNode + Merge<Node>,
Expand Down Expand Up @@ -61,17 +50,6 @@ where
}
}

/// PartialEq
// impl<KeyType, Inner> PartialEq<GHT<KeyType, Inner>> for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt,
// Inner: GeneralizedHashTrieNode + Merge<Inner> + PartialEq,
// {
// fn eq(&self, other: &GHT<KeyType, Inner>) -> bool {
// self.trie.eq(&other.trie)
// }
// }

impl<Head, Node> PartialEq<GhtInner<Head, Node>> for GhtInner<Head, Node>
where
Head: Hash + Eq + 'static + Clone,
Expand Down Expand Up @@ -102,17 +80,6 @@ where
}
}

// PartialOrd
// impl<KeyType, Inner> PartialOrd<GHT<KeyType, Inner>> for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt, // + AsRefVariadicPartialEq
// Inner: GeneralizedHashTrieNode + Merge<Inner> + PartialOrd,
// {
// fn partial_cmp(&self, other: &GHT<KeyType, Inner>) -> Option<Ordering> {
// self.trie.partial_cmp(&other.trie)
// }
// }

impl<Head, Node> PartialOrd<GhtInner<Head, Node>> for GhtInner<Head, Node>
where
Head: Hash + Eq + 'static + Clone,
Expand Down Expand Up @@ -208,15 +175,6 @@ where
}
}

// LatticeOrd
// impl<KeyType, Inner> LatticeOrd<GHT<KeyType, Inner>> for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt, // + AsRefVariadicPartialEq
// Inner: GeneralizedHashTrieNode,
// Self: PartialOrd<Self>,
// {
// }

impl<Head, Node> LatticeOrd<GhtInner<Head, Node>> for GhtInner<Head, Node>
where
Self: PartialOrd<GhtInner<Head, Node>>,
Expand All @@ -233,17 +191,6 @@ where
{
}

// IsBot
// impl<KeyType, Inner> IsBot for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt, // + AsRefVariadicPartialEq
// Inner: GeneralizedHashTrieNode + IsBot,
// {
// fn is_bot(&self) -> bool {
// self.trie.is_bot()
// }
// }

impl<Head, Node> IsBot for GhtInner<Head, Node>
where
Head: Clone,
Expand All @@ -265,17 +212,6 @@ where
}
}

// IsTop
// impl<KeyType, Inner> IsTop for GHT<KeyType, Inner>
// where
// KeyType: VariadicExt, // + AsRefVariadicPartialEq
// Inner: GeneralizedHashTrieNode + IsTop,
// {
// fn is_top(&self) -> bool {
// self.trie.is_top()
// }
// }

impl<Head, Node> IsTop for GhtInner<Head, Node>
where
Head: Clone,
Expand Down Expand Up @@ -394,28 +330,6 @@ impl<Bimorphism> GhtBimorphism<Bimorphism> {
}
}

// impl<GhtA, GhtB, ValFunc, Output> LatticeBimorphism<GhtA, GhtB> for GhtBimorphism<ValFunc>
// where
// GhtA: GeneralizedHashTrie,
// GhtB: GeneralizedHashTrie,
// for<'a, 'b> ValFunc: LatticeBimorphism<&'a GhtA::Trie, &'b GhtB::Trie, Output = Output>,
// Output: GeneralizedHashTrieNode,
// // <<GhtA as GeneralizedHashTrie>::ValType as VariadicExt>::Extend<
// // <GhtB as GeneralizedHashTrie>::ValType,
// // >: + AsRefVariadicPartialEq
// {
// type Output = GHT<GhtA::KeyType, Output>; // HashMap<Head, ValFunc::Output>; // GhtOut;

// fn call(&mut self, ght_a: GhtA, ght_b: GhtB) -> Self::Output {
// let node_bim = &mut self.bimorphism; // GhtNodeKeyedBimorphism::<ValFunc>::new(self.bimorphism);
// let trie = node_bim.call(ght_a.get_trie(), ght_b.get_trie());
// GHT {
// trie,
// _key: std::marker::PhantomData,
// }
// }
// }

impl<GhtA, GhtB, ValFunc, GhtOut> LatticeBimorphism<GhtA, GhtB> for GhtBimorphism<ValFunc>
where
GhtA: GeneralizedHashTrieNode,
Expand Down

0 comments on commit 6a17c47

Please sign in to comment.