patrick
/
anthem-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move InputConstantDeclarationDomains to problem module

This commit is contained in:
Patrick Lühne 2020-05-11 03:48:14 +02:00
parent e0b8b1c854
commit b5d049a82a
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@ -12,4 +12,4 @@ mod utils;
pub use error::Error; pub use error::Error;
pub use problem::Problem; pub use problem::Problem;
pub(crate) use utils::*; pub(crate) use utils::*;
pub use utils::{Domain, InputConstantDeclarationDomains}; pub use utils::Domain;

10
src/problem.rs
View File

@ -43,11 +43,14 @@ pub struct Statement
type VariableDeclarationIDs type VariableDeclarationIDs
= std::collections::BTreeMap::<std::rc::Rc<foliage::VariableDeclaration>, usize>; = std::collections::BTreeMap::<std::rc::Rc<foliage::VariableDeclaration>, usize>;
type InputConstantDeclarationDomains
= std::collections::BTreeMap<std::rc::Rc<foliage::FunctionDeclaration>, crate::Domain>;
struct FormatContext<'a, 'b> struct FormatContext<'a, 'b>
{ {
pub program_variable_declaration_ids: std::cell::RefCell<VariableDeclarationIDs>, pub program_variable_declaration_ids: std::cell::RefCell<VariableDeclarationIDs>,
pub integer_variable_declaration_ids: std::cell::RefCell<VariableDeclarationIDs>, pub integer_variable_declaration_ids: std::cell::RefCell<VariableDeclarationIDs>,
pub input_constant_declaration_domains: &'a crate::InputConstantDeclarationDomains, pub input_constant_declaration_domains: &'a InputConstantDeclarationDomains,
pub variable_declaration_domains: &'b VariableDeclarationDomains, pub variable_declaration_domains: &'b VariableDeclarationDomains,
} }
@ -89,8 +92,7 @@ pub struct Problem
statements: std::cell::RefCell<std::collections::BTreeMap<SectionKind, Vec<Statement>>>, statements: std::cell::RefCell<std::collections::BTreeMap<SectionKind, Vec<Statement>>>,
pub input_constant_declarations: std::cell::RefCell<foliage::FunctionDeclarations>, pub input_constant_declarations: std::cell::RefCell<foliage::FunctionDeclarations>,
pub input_constant_declaration_domains: pub input_constant_declaration_domains: std::cell::RefCell<InputConstantDeclarationDomains>,
std::cell::RefCell<crate::InputConstantDeclarationDomains>,
pub input_predicate_declarations: std::cell::RefCell<foliage::PredicateDeclarations>, pub input_predicate_declarations: std::cell::RefCell<foliage::PredicateDeclarations>,
// TODO: clean up as variable declarations are dropped // TODO: clean up as variable declarations are dropped
variable_declaration_domains: std::cell::RefCell<VariableDeclarationDomains>, variable_declaration_domains: std::cell::RefCell<VariableDeclarationDomains>,
@ -110,7 +112,7 @@ impl Problem
input_constant_declarations: input_constant_declarations:
std::cell::RefCell::new(foliage::FunctionDeclarations::new()), std::cell::RefCell::new(foliage::FunctionDeclarations::new()),
input_constant_declaration_domains: input_constant_declaration_domains:
std::cell::RefCell::new(crate::InputConstantDeclarationDomains::new()), std::cell::RefCell::new(InputConstantDeclarationDomains::new()),
input_predicate_declarations: input_predicate_declarations:
std::cell::RefCell::new(foliage::PredicateDeclarations::new()), std::cell::RefCell::new(foliage::PredicateDeclarations::new()),
variable_declaration_domains: variable_declaration_domains:

3
src/utils.rs
View File

@ -43,6 +43,3 @@ pub(crate) struct ScopedFormula
pub free_variable_declarations: std::rc::Rc<foliage::VariableDeclarations>, pub free_variable_declarations: std::rc::Rc<foliage::VariableDeclarations>,
pub formula: foliage::Formula, pub formula: foliage::Formula,
} }
pub type InputConstantDeclarationDomains
= std::collections::BTreeMap<std::rc::Rc<foliage::FunctionDeclaration>, Domain>;