Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/enumo/sexp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::str::FromStr;
use super::*;

/// S-expression
#[derive(PartialEq, Eq, Clone, Debug)]
#[derive(PartialEq, Eq, Clone, Debug, Hash)]
pub enum Sexp {
Atom(String),
List(Vec<Self>),
Expand Down
17 changes: 12 additions & 5 deletions src/enumo/workload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use egg::{EGraph, ENodeOrVar, RecExpr};

use super::*;
use crate::{SynthAnalysis, SynthLanguage};
use std::io::Write;
use std::{collections::HashSet, io::Write};

/// Workloads are sets of terms from a domain
#[derive(PartialEq, Eq, Clone, Debug)]
Expand Down Expand Up @@ -108,11 +108,11 @@ impl Workload {
set
}
Workload::Append(workloads) => {
let mut set = vec![];
let mut set = HashSet::new();
for w in workloads {
set.extend(w.force());
}
set
set.into_iter().collect()
}
}
}
Expand All @@ -137,10 +137,10 @@ impl Workload {
let into: Workload = workload.into();
match (self, into) {
(Workload::Set(xs), Workload::Set(ys)) => {
let mut all = vec![];
let mut all = HashSet::new();
all.extend(xs);
all.extend(ys);
Workload::Set(all)
Workload::Set(all.into_iter().collect())
}
(Workload::Append(xs), Workload::Append(ys)) => {
let mut all = vec![];
Expand Down Expand Up @@ -265,6 +265,13 @@ mod test {
}
}

#[test]
fn append_dups() {
let w1 = Workload::new(["a", "b", "x"]);
let w2 = Workload::new(["c", "x", "d", "d"]);
assert!(w1.append(w2).force().len() == 5)
}

#[test]
fn append() {
let empty = Workload::Set(vec![]);
Expand Down
Loading