elvis/ReactionSystems
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
elvis
2025-06-16 14:46:04 +02:00
parent 0975d593f8
commit b94afa3f52
8 changed files with 359 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/main.rs
View File

@ -1,39 +1,42 @@
mod rsprocess;
use lalrpop_util::lalrpop_mod;
use rsprocess::transitions;
use std::rc::Rc;
// use std::io;
fn main() -> Result<(), Box<dyn std::error::Error>> {
lalrpop_mod!(grammar, "/rsprocess/grammar.rs");
let mut translator = rsprocess::translator::Translator::new();
// let mut buffer = String::new();
// let i = io::stdin();
// i.read_line(&mut buffer).expect("Can't read stdin");
// let result = grammar::SetParser::new().parse(&buffer).unwrap();
// let result = grammar::SetParser::new().parse(&mut translator, &buffer).unwrap();
// -------------------------------------------------------------------------
// let reactants = grammar::SetParser::new().parse("{a}").unwrap();
// let inihibitors = grammar::SetParser::new().parse("{c}").unwrap();
// let products = grammar::SetParser::new().parse("{a,c}").unwrap();
// let reactants = grammar::SetParser::new().parse(&mut translator, "{a}").unwrap();
// let inihibitors = grammar::SetParser::new().parse(&mut translator, "{c}").unwrap();
// let products = grammar::SetParser::new().parse(&mut translator, "{a,c}").unwrap();
// let process1 = rsprocess::structure::RSreaction::from(reactants, inihibitors, products);
// let reactants = grammar::SetParser::new().parse("{b}").unwrap();
// let inihibitors = grammar::SetParser::new().parse("{c}").unwrap();
// let products = grammar::SetParser::new().parse("{b,c}").unwrap();
// let reactants = grammar::SetParser::new().parse(&mut translator, "{b}").unwrap();
// let inihibitors = grammar::SetParser::new().parse(&mut translator, "{c}").unwrap();
// let products = grammar::SetParser::new().parse(&mut translator, "{b,c}").unwrap();
// let process2 = rsprocess::structure::RSreaction::from(reactants, inihibitors, products);
// let current_state = grammar::SetParser::new().parse("{b}").unwrap();
// let current_state = grammar::SetParser::new().parse(&mut translator, "{b}").unwrap();
// println!("{:?}", rsprocess::classical::compute_all(&current_state, vec![&process1, &process2]));
// -------------------------------------------------------------------------
// let env = grammar::EnvironmentParser::new().parse("[x = {a}.{b}.x , y = ({a,c}.y + {b,c}.y)]").unwrap();
// let process = grammar::ContextParser::new().parse("[({a}.nil + x + y)]").unwrap();
// let env = grammar::EnvironmentParser::new().parse(&mut translator, "[x = {a}.{b}.x , y = ({a,c}.y + {b,c}.y)]").unwrap();
// let process = grammar::ContextParser::new().parse(&mut translator, "[({a}.nil + x + y)]").unwrap();
// println!("{:?}", rsprocess::transitions::unfold(&env, &process));
@ -45,69 +48,70 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// -------------------------------------------------------------------------
// allTransitions(sys([],[a,b],[],[react([a],[c],[a]),react([b],[d],[b])]) , Moves).
// let env = grammar::EnvironmentParser::new().parse("[]").unwrap();
// let process = grammar::ContextParser::new().parse("[]").unwrap();
// let env = grammar::EnvironmentParser::new().parse(&mut translator, "[]").unwrap();
// let process = grammar::ContextParser::new().parse(&mut translator, "[]").unwrap();
// let sys = rsprocess::structure::RSsystem::from(*env,
// rsprocess::structure::RSset::from(vec!["a", "b"]),
// let sys = rsprocess::structure::RSsystem::from(Rc::new(*env),
// rsprocess::structure::RSset::from(vec![translator.convert("a"),
// translator.convert("b")]),
// *process,
// vec![
// Rc::new(vec![
// rsprocess::structure::RSreaction::from(
// rsprocess::structure::RSset::from(vec!["a"]),
// rsprocess::structure::RSset::from(vec!["c"]),
// rsprocess::structure::RSset::from(vec!["a"])
// rsprocess::structure::RSset::from(vec![translator.convert("a")]),
// rsprocess::structure::RSset::from(vec![translator.convert("c")]),
// rsprocess::structure::RSset::from(vec![translator.convert("a")])
// ),
// rsprocess::structure::RSreaction::from(
// rsprocess::structure::RSset::from(vec!["b"]),
// rsprocess::structure::RSset::from(vec!["d"]),
// rsprocess::structure::RSset::from(vec!["b"])
// rsprocess::structure::RSset::from(vec![translator.convert("b")]),
// rsprocess::structure::RSset::from(vec![translator.convert("d")]),
// rsprocess::structure::RSset::from(vec![translator.convert("b")])
// )
// ]);
// ]));
// println!("all_transitions: {:?}", rsprocess::transitions::all_transitions(&sys));
// -------------------------------------------------------------------------
// parse_ctx("[({a}.nil + {b}.nil)]",Ks) , allTransitions(sys([],[],Ks,[react([a],[c],[a]),react([b],[d],[b])]),Moves).
// let env = grammar::EnvironmentParser::new().parse("[]").unwrap();
// let process = grammar::ContextParser::new().parse("[({a}.nil + {b}.nil)]").unwrap();
// let env = grammar::EnvironmentParser::new().parse(&mut translator, "[]").unwrap();
// let process = grammar::ContextParser::new().parse(&mut translator, "[({a}.nil + {b}.nil)]").unwrap();
// let sys = rsprocess::structure::RSsystem::from(*env,
// let sys = rsprocess::structure::RSsystem::from(Rc::new(*env),
// rsprocess::structure::RSset::from(vec![]),
// *process,
// vec![
// Rc::new(vec![
// rsprocess::structure::RSreaction::from(
// rsprocess::structure::RSset::from(vec!["a"]),
// rsprocess::structure::RSset::from(vec!["c"]),
// rsprocess::structure::RSset::from(vec!["a"])
// rsprocess::structure::RSset::from(vec![translator.convert("a")]),
// rsprocess::structure::RSset::from(vec![translator.convert("c")]),
// rsprocess::structure::RSset::from(vec![translator.convert("a")])
// ),
// rsprocess::structure::RSreaction::from(
// rsprocess::structure::RSset::from(vec!["b"]),
// rsprocess::structure::RSset::from(vec!["d"]),
// rsprocess::structure::RSset::from(vec!["b"])
// rsprocess::structure::RSset::from(vec![translator.convert("b")]),
// rsprocess::structure::RSset::from(vec![translator.convert("d")]),
// rsprocess::structure::RSset::from(vec![translator.convert("b")])
// )
// ]);
// ]));
// println!("all_transitions: {:?}", rsprocess::transitions::all_transitions(&sys));
// -------------------------------------------------------------------------
// parse_ctx("[({a}.nil + {b}.nil),({c}.nil + {d}.nil)]",Ks) , allTransitions(sys([],[],Ks,[react([a],[c],[a]),react([b],[d],[b])]),Moves).
let env = grammar::EnvironmentParser::new().parse("[]").unwrap();
let process = grammar::ContextParser::new().parse("[({a}.nil + {b}.nil),({c}.nil + {d}.nil)]").unwrap();
let env = grammar::EnvironmentParser::new().parse(&mut translator, "[]").unwrap();
let process = grammar::ContextParser::new().parse(&mut translator, "[({a}.nil + {b}.nil),({c}.nil + {d}.nil)]").unwrap();
let sys = rsprocess::structure::RSsystem::from(Rc::new(*env),
rsprocess::structure::RSset::from(vec![]),
*process,
Rc::new(vec![
rsprocess::structure::RSreaction::from(
rsprocess::structure::RSset::from(vec!["a"]),
rsprocess::structure::RSset::from(vec!["c"]),
rsprocess::structure::RSset::from(vec!["a"])
rsprocess::structure::RSset::from(vec![translator.convert("a")]),
rsprocess::structure::RSset::from(vec![translator.convert("c")]),
rsprocess::structure::RSset::from(vec![translator.convert("a")])
),
rsprocess::structure::RSreaction::from(
rsprocess::structure::RSset::from(vec!["b"]),
rsprocess::structure::RSset::from(vec!["d"]),
rsprocess::structure::RSset::from(vec!["b"])
rsprocess::structure::RSset::from(vec![translator.convert("b")]),
rsprocess::structure::RSset::from(vec![translator.convert("d")]),
rsprocess::structure::RSset::from(vec![translator.convert("b")])
)
]));

4
src/rsprocess/classical.rs
View File

@ -10,7 +10,7 @@ use super::structure::{RSset, RSreaction};
/// Computes the result of a single reaction (if enabled returns the products)
/// otherwise returns None.
pub fn compute_step<'a>(current_state: &RSset<'a>, reaction: &'a RSreaction<'a>) -> Option<&'a RSset<'a>> {
pub fn compute_step<'a>(current_state: &'a RSset, reaction: &'a RSreaction) -> Option<&'a RSset> {
if reaction.enabled(current_state) {
Some(reaction.products())
} else {
@ -20,6 +20,6 @@ pub fn compute_step<'a>(current_state: &RSset<'a>, reaction: &'a RSreaction<'a>)
/// Computes the result of a series of reactions. Returns the union of all
/// products.
pub fn compute_all<'a>(current_state: &RSset<'a>, reactions: Vec<&'a RSreaction<'a>>) -> RSset<'a> {
pub fn compute_all<'a>(current_state: &'a RSset, reactions: Vec<&'a RSreaction>) -> RSset {
reactions.iter().fold(RSset::new(), |acc, r| acc.union_option(compute_step(current_state, r)))
}

40
src/rsprocess/grammar.lalrpop
View File

@ -2,8 +2,9 @@ use std::rc::Rc;
use std::str::FromStr;
use lalrpop_util::ParseError;
use crate::rsprocess::structure::{RSset, RSprocess, RSenvironment, RSassert, RSassertOp, RSBHML};
use crate::rsprocess::translator::{Translator, IdType};
grammar;
grammar(translator: &mut Translator);
// matches words (letter followed by numbers, letters or _)
Literal = { r"[[:alpha:]][[:word:]]*" };
@ -26,64 +27,67 @@ Separeted<T, C>: Vec<T> = {
};
// ----- SetParser -----
pub Set: RSset<'input> = {
pub Set: RSset = {
<s: Set_of_entities> => s
};
Set_of_entities: RSset<'input> = {
Set_of_entities: RSset = {
"{" "}" => RSset::from(vec![]),
"{" <t: Literal> "}" => RSset::from(vec![t]),
"{" <t: Separeted<Literal, ",">> "}" => RSset::from(t)
"{" <t: Literal> "}" => RSset::from(vec![translator.convert(t)]),
"{" <t: Separeted<Literal, ",">> "}" =>
RSset::from(t.into_iter().map(|t| translator.convert(t)).collect::<Vec<_>>())
};
// ----- ContextParser -----
pub Context: Box<RSprocess<'input>> = {
pub Context: Box<RSprocess> = {
// "[" "]" => Box::new(RSprocess::Nill),
// "[" <t: CTX_process> "]" => Box::new(t),
// "[" <t: Separeted<Boxed_CTX_process, ",">> "]" =>
// Box::new(RSprocess::NondeterministicChoice{ children: t })
"[" "]" => Box::new(RSprocess::NondeterministicChoice{ children: vec![] }),
"[" <t: CTX_process> "]" => Box::new(RSprocess::NondeterministicChoice{ children: vec![Rc::new(t)] }),
"[" <t: CTX_process> "]" =>
Box::new(RSprocess::NondeterministicChoice{children: vec![Rc::new(t)]}),
"[" <t: Separeted<Boxed_CTX_process, ",">> "]" =>
Box::new(RSprocess::NondeterministicChoice{ children: t })
};
Boxed_CTX_process: Rc<RSprocess<'input>> = {
Boxed_CTX_process: Rc<RSprocess> = {
<t: CTX_process> => Rc::new(t)
}
CTX_process: RSprocess<'input> = {
CTX_process: RSprocess = {
<c: Set_of_entities> "." <k: CTX_process> =>
RSprocess::EntitySet{ entities: c, next_process: Rc::new(k) },
"(" <k: CTX_process> ")" => k,
"(" <k: Separeted<CTX_process, "+">> ")" =>
RSprocess::Summation{ children: k },
RSprocess::Summation{ children: k.into_iter().map(|k| Rc::new(k)).collect::<Vec<_>>() },
"<" <n: Num> <k1: CTX_process> ">" "." <k: CTX_process> =>
RSprocess::WaitEntity{ repeat: n,
repeated_process: Rc::new(k1),
next_process: Rc::new(k)},
"nil" => RSprocess::Nill,
<identifier: Literal> =>
RSprocess::RecursiveIdentifier{ identifier }
RSprocess::RecursiveIdentifier{ identifier: translator.convert(identifier) }
};
// ----- EnvironmentParser -----
pub Environment: Box<RSenvironment<'input>> = {
pub Environment: Box<RSenvironment> = {
"[" "]" => Box::new(RSenvironment::new()),
"[" <t: Separeted<Env_term, ",">> "]" => Box::new(RSenvironment::from(t))
};
Env_term: (&'input str, RSprocess<'input>) = {
<identifier: Literal> "=" <k: CTX_process> => (identifier, k)
Env_term: (IdType, RSprocess) = {
<identifier: Literal> "=" <k: CTX_process> =>
(translator.convert(identifier), k)
};
// ----- AssertParser -----
pub Assert: Box<RSassert<'input>> = {
pub Assert: Box<RSassert> = {
<f: Formula_Assert> => Box::new(f)
};
Formula_Assert: RSassert<'input> = {
Formula_Assert: RSassert = {
"-" <f: Formula_Assert> => RSassert::Not(Box::new(f)),
"(" <f1: Formula_Assert> "^" <f2: Formula_Assert> ")" =>
RSassert::Xor(Box::new(f1), Box::new(f2)),
@ -100,11 +104,11 @@ Formula_Assert: RSassert<'input> = {
};
// ----- BHMLParser -----
pub BHML: Box<RSBHML<'input>> = {
pub BHML: Box<RSBHML> = {
<g: Formula_BHML> => Box::new(g)
};
Formula_BHML: RSBHML<'input> = {
Formula_BHML: RSBHML = {
"true" => RSBHML::True,
"false" => RSBHML::False,
"(" <g: Separeted<Formula_BHML, "\\/">> ")" => RSBHML::Or(g),

1
src/rsprocess/mod.rs
View File

@ -1,3 +1,4 @@
pub mod translator;
pub mod structure;
pub mod support_structures;
pub mod classical;

236
src/rsprocess/structure.rs
View File

@ -2,54 +2,55 @@
use std::collections::{HashMap, HashSet};
use std::rc::Rc;
use super::translator::{IdType};
// -----------------------------------------------------------------------------
// RSset
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub struct RSset<'a> {
identifiers: HashSet<&'a str>
pub struct RSset {
identifiers: HashSet<IdType>
}
impl<'a, const N: usize> From<[&'a str; N]> for RSset<'a> {
fn from(arr: [&'a str; N]) -> Self {
impl<const N: usize> From<[IdType; N]> for RSset {
fn from(arr: [IdType; N]) -> Self {
RSset{identifiers: HashSet::from(arr)}
}
}
impl<'a> From<&[&'a str]> for RSset<'a> {
fn from(arr: &[&'a str]) -> Self {
impl From<&[IdType]> for RSset {
fn from(arr: &[IdType]) -> Self {
RSset{identifiers: HashSet::from_iter(arr.to_vec())}
}
}
impl<'a> From<Vec<&'a str>> for RSset<'a> {
fn from(arr: Vec<&'a str>) -> Self {
impl From<Vec<IdType>> for RSset {
fn from(arr: Vec<IdType>) -> Self {
RSset{identifiers: HashSet::from_iter(arr)}
}
}
impl<'a> RSset<'a> {
impl RSset {
pub fn new() -> Self {
RSset{identifiers: HashSet::new()}
}
pub fn is_subset(&self, b: &RSset<'a>) -> bool {
pub fn is_subset(&self, b: &RSset) -> bool {
self.identifiers.is_subset(&b.identifiers)
}
pub fn is_disjoint(&self, b: &RSset<'a>) -> bool {
pub fn is_disjoint(&self, b: &RSset) -> bool {
self.identifiers.is_disjoint(&b.identifiers)
}
pub fn union(&self, b: &RSset<'a>) -> RSset<'a> {
pub fn union(&self, b: &RSset) -> RSset {
// TODO maybe find more efficient way without copy/clone
let mut ret: RSset = b.clone();
ret.identifiers.extend(self.identifiers.iter());
ret
}
pub fn union_option(&self, b: Option<&RSset<'a>>) -> RSset<'a> {
pub fn union_option(&self, b: Option<&RSset>) -> RSset {
if let Some(b) = b {
self.union(b)
} else {
@ -57,7 +58,7 @@ impl<'a> RSset<'a> {
}
}
pub fn intersection(&self, b: &RSset<'a>) -> RSset<'a> {
pub fn intersection(&self, b: &RSset) -> RSset {
// TODO maybe find more efficient way without copy/clone
let res: HashSet<_> = b.identifiers.intersection(&self.identifiers)
.copied()
@ -65,7 +66,7 @@ impl<'a> RSset<'a> {
RSset { identifiers: res }
}
pub fn subtraction(&self, b: &RSset<'a>) -> RSset<'a> {
pub fn subtraction(&self, b: &RSset) -> RSset {
// TODO maybe find more efficient way without copy/clone
let res: HashSet<_> = self.identifiers.difference(&b.identifiers)
.copied()
@ -79,43 +80,43 @@ impl<'a> RSset<'a> {
// RSreaction
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub struct RSreaction<'a> {
reactants: RSset<'a>,
inihibitors: RSset<'a>,
products: RSset<'a>
pub struct RSreaction {
reactants: RSset,
inihibitors: RSset,
products: RSset
}
impl<'a> RSreaction<'a> {
impl RSreaction {
pub fn new() -> Self {
RSreaction{ reactants: RSset::new(),
inihibitors: RSset::new(),
products: RSset::new(), }
}
pub fn from(reactants: RSset<'a>, inihibitors: RSset<'a>, products: RSset<'a>) -> Self {
pub fn from(reactants: RSset, inihibitors: RSset, products: RSset) -> Self {
RSreaction{ reactants,
inihibitors,
products }
}
pub fn enabled(&self, current_state: &RSset<'a>) -> bool {
pub fn enabled(&self, current_state: &RSset) -> bool {
self.reactants.is_subset(current_state)
&& self.inihibitors.is_disjoint(current_state)
}
pub fn products_clone(&self) -> RSset<'a> {
pub fn products_clone(&self) -> RSset {
self.products.clone()
}
pub fn reactants(&self) -> &RSset<'a> {
pub fn reactants(&self) -> &RSset {
&self.reactants
}
pub fn inihibitors(&self) -> &RSset<'a> {
pub fn inihibitors(&self) -> &RSset {
&self.inihibitors
}
pub fn products(&self) -> &RSset<'a> {
pub fn products(&self) -> &RSset {
&self.products
}
}
@ -126,21 +127,28 @@ impl<'a> RSreaction<'a> {
// RSprocess
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub enum RSprocess<'a> {
pub enum RSprocess {
Nill,
RecursiveIdentifier{identifier: &'a str},
EntitySet{entities: RSset<'a>, next_process: Rc<RSprocess<'a>>},
WaitEntity{repeat: i64, repeated_process: Rc<RSprocess<'a>>, next_process: Rc<RSprocess<'a>>},
Summation{children: Vec<RSprocess<'a>>},
NondeterministicChoice{children: Vec<Rc<RSprocess<'a>>>}
RecursiveIdentifier{ identifier: IdType },
EntitySet{ entities: RSset,
next_process: Rc<RSprocess> },
WaitEntity{ repeat: i64,
repeated_process: Rc<RSprocess>,
next_process: Rc<RSprocess> },
Summation{ children: Vec<Rc<RSprocess>> },
NondeterministicChoice{ children: Vec<Rc<RSprocess>> }
}
impl<'a> RSprocess<'a> {
impl RSprocess {
// TODO: remove all the clone()
pub fn concat(&self, new: &RSprocess<'a>) -> RSprocess<'a>{
pub fn concat(&self, new: &RSprocess) -> RSprocess{
match (self, new) {
(RSprocess::NondeterministicChoice{children: c1}, RSprocess::NondeterministicChoice{children: c2}) => {
RSprocess::NondeterministicChoice { children: [c1.clone(), c2.clone()].concat() }
(RSprocess::NondeterministicChoice{children: c1},
RSprocess::NondeterministicChoice{children: c2}) => {
RSprocess::NondeterministicChoice {
children: [c1.clone(),
c2.clone()].concat()
}
},
(RSprocess::NondeterministicChoice{children}, new) |
(new, RSprocess::NondeterministicChoice{children}) => {
@ -149,39 +157,43 @@ impl<'a> RSprocess<'a> {
RSprocess::NondeterministicChoice{ children: new_children }
},
(_, _) => {
RSprocess::NondeterministicChoice { children: vec![Rc::new(self.clone()), Rc::new(new.clone())] }
RSprocess::NondeterministicChoice {
children: vec![Rc::new(self.clone()),
Rc::new(new.clone())]
}
}
}
}
}
#[derive(Clone, Debug)]
pub struct RSChoices<'a> {
context_moves: Vec<(Rc<RSset<'a>>, Rc<RSprocess<'a>>)>
pub struct RSChoices {
context_moves: Vec<(Rc<RSset>, Rc<RSprocess>)>
}
impl<'a> RSChoices<'a> {
impl RSChoices {
pub fn new() -> Self {
RSChoices{ context_moves: vec![] }
}
pub fn new_not_empty() -> Self {
RSChoices{ context_moves: vec![(Rc::new(RSset::new()), Rc::new(RSprocess::Nill))] }
RSChoices{ context_moves: vec![(Rc::new(RSset::new()),
Rc::new(RSprocess::Nill))] }
}
pub fn append(&mut self, a: &mut RSChoices<'a>) {
pub fn append(&mut self, a: &mut RSChoices) {
self.context_moves.append(&mut a.context_moves);
}
pub fn replace(&mut self, a: Rc<RSprocess<'a>>) {
pub fn replace(&mut self, a: Rc<RSprocess>) {
self.context_moves =
self.context_moves
.iter_mut()
.map(|(c1, _)| (Rc::clone(c1), Rc::clone(&a))).collect::<Vec<_>>();
}
pub fn shuffle(&mut self, choices: RSChoices<'a>) {
match (self.context_moves.is_empty(), choices.context_moves.is_empty()) {
pub fn shuffle(&mut self, choices: RSChoices) {
match (self.context_moves.is_empty(), choices.context_moves.is_empty()){
(true, true) => {}
(true, false) => { self.context_moves = choices.context_moves }
(false, true) => {}
@ -189,8 +201,10 @@ impl<'a> RSChoices<'a> {
let mut new_self = vec![];
for item_self in &self.context_moves {
for item_choices in &choices.context_moves {
new_self.push((Rc::new(item_self.0.union(&item_choices.0)),
Rc::new(item_self.1.concat(&item_choices.1))));
new_self.push(
(Rc::new(item_self.0.union(&item_choices.0)),
Rc::new(item_self.1.concat(&item_choices.1)))
);
}
}
self.context_moves = new_self;
@ -199,8 +213,8 @@ impl<'a> RSChoices<'a> {
}
}
impl<'a> IntoIterator for RSChoices<'a> {
type Item = (Rc<RSset<'a>>, Rc<RSprocess<'a>>);
impl IntoIterator for RSChoices {
type Item = (Rc<RSset>, Rc<RSprocess>);
type IntoIter = std::vec::IntoIter<Self::Item>;
fn into_iter(self) -> Self::IntoIter {
@ -208,20 +222,20 @@ impl<'a> IntoIterator for RSChoices<'a> {
}
}
impl<'a, const N: usize> From<[(Rc<RSset<'a>>, Rc<RSprocess<'a>>); N]> for RSChoices<'a> {
fn from(arr: [(Rc<RSset<'a>>, Rc<RSprocess<'a>>); N]) -> Self {
impl<const N: usize> From<[(Rc<RSset>, Rc<RSprocess>); N]> for RSChoices {
fn from(arr: [(Rc<RSset>, Rc<RSprocess>); N]) -> Self {
RSChoices{context_moves: arr.to_vec()}
}
}
impl<'a> From<&[(Rc<RSset<'a>>, Rc<RSprocess<'a>>)]> for RSChoices<'a> {
fn from(arr: &[(Rc<RSset<'a>>, Rc<RSprocess<'a>>)]) -> Self {
impl From<&[(Rc<RSset>, Rc<RSprocess>)]> for RSChoices {
fn from(arr: &[(Rc<RSset>, Rc<RSprocess>)]) -> Self {
RSChoices{context_moves: arr.to_vec()}
}
}
impl<'a> From<Vec<(Rc<RSset<'a>>, Rc<RSprocess<'a>>)>> for RSChoices<'a> {
fn from(arr: Vec<(Rc<RSset<'a>>, Rc<RSprocess<'a>>)>) -> Self {
impl From<Vec<(Rc<RSset>, Rc<RSprocess>)>> for RSChoices {
fn from(arr: Vec<(Rc<RSset>, Rc<RSprocess>)>) -> Self {
RSChoices{context_moves: arr}
}
}
@ -230,34 +244,34 @@ impl<'a> From<Vec<(Rc<RSset<'a>>, Rc<RSprocess<'a>>)>> for RSChoices<'a> {
// RSenvironment
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub struct RSenvironment<'a> {
definitions: HashMap<&'a str, RSprocess<'a>>,
pub struct RSenvironment {
definitions: HashMap<IdType, RSprocess>,
}
impl<'a> RSenvironment<'a> {
pub fn new() -> RSenvironment<'a> {
impl RSenvironment {
pub fn new() -> RSenvironment {
RSenvironment{definitions: HashMap::new()}
}
pub fn get(&self, k: &'a str) -> Option<&RSprocess<'a>> {
self.definitions.get(k)
pub fn get(&self, k: IdType) -> Option<&RSprocess> {
self.definitions.get(&k)
}
}
impl<'a, const N: usize> From<[(&'a str, RSprocess<'a>); N]> for RSenvironment<'a> {
fn from(arr: [(&'a str, RSprocess<'a>); N]) -> Self {
impl<const N: usize> From<[(IdType, RSprocess); N]> for RSenvironment {
fn from(arr: [(IdType, RSprocess); N]) -> Self {
RSenvironment{definitions: HashMap::from(arr)}
}
}
impl<'a> From<&[(&'a str, RSprocess<'a>)]> for RSenvironment<'a> {
fn from(arr: &[(&'a str, RSprocess<'a>)]) -> Self {
impl From<&[(IdType, RSprocess)]> for RSenvironment {
fn from(arr: &[(IdType, RSprocess)]) -> Self {
RSenvironment{definitions: HashMap::from_iter(arr.to_vec())}
}
}
impl<'a> From<Vec<(&'a str, RSprocess<'a>)>> for RSenvironment<'a> {
fn from(arr: Vec<(&'a str, RSprocess<'a>)>) -> Self {
impl From<Vec<(IdType, RSprocess)>> for RSenvironment {
fn from(arr: Vec<(IdType, RSprocess)>) -> Self {
RSenvironment{definitions: HashMap::from_iter(arr)}
}
}
@ -266,15 +280,15 @@ impl<'a> From<Vec<(&'a str, RSprocess<'a>)>> for RSenvironment<'a> {
// RSsystem
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub struct RSsystem<'a> {
delta: Rc<RSenvironment<'a>>,
available_entities: RSset<'a>,
context_process: RSprocess<'a>,
reaction_rules: Rc<Vec<RSreaction<'a>>>,
pub struct RSsystem {
delta: Rc<RSenvironment>,
available_entities: RSset,
context_process: RSprocess,
reaction_rules: Rc<Vec<RSreaction>>,
}
impl<'a> RSsystem<'a> {
pub fn new() -> RSsystem<'a> {
impl RSsystem {
pub fn new() -> RSsystem {
RSsystem {
delta: Rc::new(RSenvironment::new()),
available_entities: RSset::new(),
@ -283,29 +297,29 @@ impl<'a> RSsystem<'a> {
}
}
pub fn from(delta: Rc<RSenvironment<'a>>,
available_entities: RSset<'a>,
context_process: RSprocess<'a>,
reaction_rules: Rc<Vec<RSreaction<'a>>>) -> RSsystem<'a> {
pub fn from(delta: Rc<RSenvironment>,
available_entities: RSset,
context_process: RSprocess,
reaction_rules: Rc<Vec<RSreaction>>) -> RSsystem {
RSsystem { delta: Rc::clone(&delta),
available_entities,
context_process,
reaction_rules: Rc::clone(&reaction_rules) }
}
pub fn get_delta(&self) -> &Rc<RSenvironment<'a>> {
pub fn get_delta(&self) -> &Rc<RSenvironment> {
&self.delta
}
pub fn get_available_entities(&self) -> &RSset<'a> {
pub fn get_available_entities(&self) -> &RSset {
&self.available_entities
}
pub fn get_context_process(&self) -> &RSprocess<'a> {
pub fn get_context_process(&self) -> &RSprocess {
&self.context_process
}
pub fn get_reaction_rules(&self) -> &Rc<Vec<RSreaction<'a>>> {
pub fn get_reaction_rules(&self) -> &Rc<Vec<RSreaction>> {
&self.reaction_rules
}
}
@ -314,18 +328,18 @@ impl<'a> RSsystem<'a> {
// RSsystem
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub struct RSlabel<'a> {
available_entities: RSset<'a>,
c: RSset<'a>, /// TODO: what is c? what is t? (c comes from choices, t is
t: RSset<'a>, /// the union of available_entities and c)
reactants: RSset<'a>,
reactantsi: RSset<'a>,
inihibitors: RSset<'a>,
ireactants: RSset<'a>,
products: RSset<'a>,
pub struct RSlabel {
available_entities: RSset,
c: RSset, /// TODO: what is c? what is t? (c comes from choices, t is
t: RSset, /// the union of available_entities and c)
reactants: RSset,
reactantsi: RSset,
inihibitors: RSset,
ireactants: RSset,
products: RSset,
}
impl<'a> RSlabel<'a> {
impl RSlabel {
pub fn new() -> Self {
RSlabel { available_entities: RSset::new(),
c: RSset::new(),
@ -338,14 +352,14 @@ impl<'a> RSlabel<'a> {
}
#[allow(clippy::too_many_arguments)]
pub fn from(available_entities: RSset<'a>,
c: RSset<'a>,
t: RSset<'a>,
reactants: RSset<'a>,
reactantsi: RSset<'a>,
inihibitors: RSset<'a>,
ireactants: RSset<'a>,
products: RSset<'a>,) -> Self {
pub fn from(available_entities: RSset,
c: RSset,
t: RSset,
reactants: RSset,
reactantsi: RSset,
inihibitors: RSset,
ireactants: RSset,
products: RSset,) -> Self {
RSlabel { available_entities,
c,
t,
@ -373,12 +387,12 @@ pub enum RSassertOp {
// RSassert
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
pub enum RSassert<'a> {
Not(Box<RSassert<'a>>),
Xor(Box<RSassert<'a>>, Box<RSassert<'a>>),
Or(Vec<RSassert<'a>>),
And(Vec<RSassert<'a>>),
Sub(RSset<'a>, RSassertOp),
pub enum RSassert {
Not(Box<RSassert>),
Xor(Box<RSassert>, Box<RSassert>),
Or(Vec<RSassert>),
And(Vec<RSassert>),
Sub(RSset, RSassertOp),
NonEmpty(RSassertOp)
}
@ -387,11 +401,11 @@ pub enum RSassert<'a> {
// -----------------------------------------------------------------------------
#[derive(Clone, Debug)]
#[allow(clippy::upper_case_acronyms)]
pub enum RSBHML<'a> {
pub enum RSBHML {
True,
False,
Or(Vec<RSBHML<'a>>),
And(Vec<RSBHML<'a>>),
Diamond(Box<RSassert<'a>>, Box<RSBHML<'a>>),
Box(Box<RSassert<'a>>, Box<RSBHML<'a>>)
Or(Vec<RSBHML>),
And(Vec<RSBHML>),
Diamond(Box<RSassert>, Box<RSBHML>),
Box(Box<RSassert>, Box<RSBHML>)
}

121
src/rsprocess/support_structures.rs
View File

@ -1,75 +1,78 @@
#![allow(dead_code)]
use std::rc::Rc;
use super::structure::{RSsystem, RSlabel, RSset, RSprocess};
use super::structure::{RSlabel, RSprocess, RSset, RSsystem};
use super::transitions::unfold;
use std::rc::Rc;
#[derive(Clone, Debug)]
pub struct TransitionsIterator<'a> {
choices_iterator: std::vec::IntoIter<(Rc<RSset<'a>>, Rc<RSprocess<'a>>)>,
system: &'a RSsystem<'a>
choices_iterator: std::vec::IntoIter<(Rc<RSset>, Rc<RSprocess>)>,
system: &'a RSsystem,
}
impl<'a> TransitionsIterator<'a> {
pub fn from(system: &'a RSsystem<'a>) -> Result<TransitionsIterator<'a>, String> {
match unfold(system.get_delta(), system.get_context_process()) {
Ok(o) => Ok(
TransitionsIterator {
choices_iterator: o.into_iter(),
system
}
),
Err(e) => Err(e)
}
pub fn from(system: &'a RSsystem) -> Result<TransitionsIterator<'a>, String> {
match unfold(system.get_delta(), system.get_context_process()) {
Ok(o) => Ok(TransitionsIterator {
choices_iterator: o.into_iter(),
system,
}),
Err(e) => Err(e),
}
}
}
impl<'a> Iterator for TransitionsIterator<'a> {
type Item = (RSlabel<'a>, RSsystem<'a>);
type Item = (RSlabel, RSsystem);
fn next(&mut self) -> Option<(RSlabel<'a>, RSsystem<'a>)> {
let (c, k) = self.choices_iterator.next()?;
let t = self.system.get_available_entities().union(c.as_ref());
let (reactants,
reactantsi,
inihibitors,
ireactants,
products) =
self.system.get_reaction_rules().iter()
.fold((RSset::new(), // reactants
RSset::new(), // reactantsi
RSset::new(), // inihibitors
RSset::new(), // ireactants
RSset::new()), // products
|acc, reaction| if reaction.enabled(&t) {
(acc.0.union(reaction.reactants()),
acc.1,
acc.2.union(reaction.inihibitors()),
acc.3,
acc.4.union(reaction.products()))
} else {
(acc.0,
acc.1.union(&reaction.inihibitors().intersection(&t)),
acc.2,
acc.3.union(&reaction.reactants().subtraction(&t)),
acc.4)
}
fn next(&mut self) -> Option<(RSlabel, RSsystem)> {
let (c, k) = self.choices_iterator.next()?;
let t = self.system.get_available_entities().union(c.as_ref());
let (reactants, reactantsi, inihibitors, ireactants, products) =
self.system.get_reaction_rules().iter().fold(
(
RSset::new(), // reactants
RSset::new(), // reactantsi
RSset::new(), // inihibitors
RSset::new(), // ireactants
RSset::new(), // products
),
|acc, reaction| {
if reaction.enabled(&t) {
(
acc.0.union(reaction.reactants()),
acc.1,
acc.2.union(reaction.inihibitors()),
acc.3,
acc.4.union(reaction.products()),
)
} else {
(
acc.0,
acc.1.union(&reaction.inihibitors().intersection(&t)),
acc.2,
acc.3.union(&reaction.reactants().subtraction(&t)),
acc.4,
)
}
},
);
);
let label = RSlabel::from(self.system.get_available_entities().clone(),
(*c).clone(),
t,
reactants,
reactantsi,
inihibitors,
ireactants,
products.clone()
);
let new_system = RSsystem::from(Rc::clone(self.system.get_delta()),
products,
(*k).clone(),
Rc::clone(self.system.get_reaction_rules())
);
Some((label, new_system))
let label = RSlabel::from(
self.system.get_available_entities().clone(),
(*c).clone(),
t,
reactants,
reactantsi,
inihibitors,
ireactants,
products.clone(),
);
let new_system = RSsystem::from(
Rc::clone(self.system.get_delta()),
products,
(*k).clone(),
Rc::clone(self.system.get_reaction_rules()),
);
Some((label, new_system))
}
}

109
src/rsprocess/transitions.rs
View File

@ -1,56 +1,76 @@
#![allow(dead_code)]
use super::structure::{RSChoices, RSenvironment, RSlabel, RSprocess, RSset, RSsystem};
use super::support_structures::TransitionsIterator;
use std::rc::Rc;
use super::structure::{RSset, RSChoices, RSenvironment, RSprocess, RSsystem, RSlabel};
use super::support_structures::{TransitionsIterator};
pub fn unfold<'a>(environment: &'a RSenvironment<'a>, context_process: &'a RSprocess<'a>) -> Result<RSChoices<'a>, String> {
pub fn unfold(
environment: &RSenvironment,
context_process: &RSprocess,
) -> Result<RSChoices, String> {
match context_process {
RSprocess::Nill => Ok(RSChoices::new()),
RSprocess::RecursiveIdentifier{identifier} => {
let newprocess = environment.get(identifier);
RSprocess::RecursiveIdentifier { identifier } => {
let newprocess = environment.get(*identifier);
if let Some(newprocess) = newprocess {
unfold(environment, newprocess)
} else {
Err(format!("Recursive call to missing symbol: {identifier}"))
}
},
RSprocess::EntitySet{entities, next_process} => {
Ok(RSChoices::from(vec![(Rc::new(entities.clone()), Rc::clone(next_process))]))
},
RSprocess::WaitEntity{repeat, repeated_process: _, next_process} if *repeat <= 0 => {
unfold(environment, next_process)
},
RSprocess::WaitEntity{repeat, repeated_process, next_process} if *repeat == 1 => {
}
RSprocess::EntitySet {
entities,
next_process,
} => Ok(RSChoices::from(vec![(
Rc::new(entities.clone()),
Rc::clone(next_process),
)])),
RSprocess::WaitEntity {
repeat,
repeated_process: _,
next_process,
} if *repeat <= 0 => unfold(environment, next_process),
RSprocess::WaitEntity {
repeat,
repeated_process,
next_process,
} if *repeat == 1 => {
let mut choices1 = unfold(environment, repeated_process)?;
choices1.replace(Rc::clone(next_process));
Ok(choices1)
},
RSprocess::WaitEntity{repeat, repeated_process, next_process} => {
}
RSprocess::WaitEntity {
repeat,
repeated_process,
next_process,
} => {
let mut choices1 = unfold(environment, repeated_process)?;
choices1.replace(
Rc::new(
RSprocess::WaitEntity{ repeat: (*repeat - 1),
repeated_process: Rc::clone(repeated_process),
next_process: Rc::clone(next_process) }
)
);
choices1.replace(Rc::new(RSprocess::WaitEntity {
repeat: (*repeat - 1),
repeated_process: Rc::clone(repeated_process),
next_process: Rc::clone(next_process),
}));
Ok(choices1)
},
RSprocess::Summation{children} => {
}
RSprocess::Summation { children } => {
// short-circuits with try_fold.
children.iter().try_fold(RSChoices::new(), |mut acc, x| {
match unfold(environment, x) {
Ok(mut choices) => {acc.append(&mut choices); Ok(acc)},
Err(e) => Err(e)
Ok(mut choices) => {
acc.append(&mut choices);
Ok(acc)
}
Err(e) => Err(e),
}
})
},
RSprocess::NondeterministicChoice{children} => {
}
RSprocess::NondeterministicChoice { children } => {
// short-circuits with try_fold.
if children.is_empty() {
Ok(RSChoices::from(vec![(Rc::new(RSset::new()), Rc::new(RSprocess::Nill))]))
Ok(RSChoices::from(vec![(
Rc::new(RSset::new()),
Rc::new(RSprocess::Nill),
)]))
} else {
children.iter().try_fold(RSChoices::new(), |mut acc, x| {
acc.shuffle(unfold(environment, x)?);
@ -61,11 +81,36 @@ pub fn unfold<'a>(environment: &'a RSenvironment<'a>, context_process: &'a RSpro
}
}
pub fn iterator_transitions<'a>(system: &'a RSsystem<'a>) -> Result<TransitionsIterator<'a>, String> {
pub fn iterator_transitions<'a>(
system: &'a RSsystem,
) -> Result<TransitionsIterator<'a>, String> {
TransitionsIterator::from(system)
}
pub fn all_transitions<'a>(system: &'a RSsystem<'a>) -> Result<Vec<(RSlabel<'a>, RSsystem<'a>)>, String> {
pub fn one_transition(
system: &RSsystem,
) -> Result<Option<(RSlabel, RSsystem)>, String> {
let mut tr = TransitionsIterator::from(system)?;
Ok(tr.next())
}
pub fn all_transitions(
system: &RSsystem,
) -> Result<Vec<(RSlabel, RSsystem)>, String> {
let tr = TransitionsIterator::from(system)?;
Ok(tr.collect::<Vec<_>>())
}
pub fn one_target(system: &RSsystem) -> Result<(i64, RSset), String> {
let current = one_transition(system)?;
if current.is_none() {
return Ok((0, system.get_available_entities().clone()));
}
let mut n = 1;
let mut current = current.unwrap().1;
while let Some((_, next)) = one_transition(&current)? {
current = next;
n += 1;
}
Ok((n, current.get_available_entities().clone()))
}

25
src/rsprocess/translator.rs Normal file
View File

@ -0,0 +1,25 @@
// translate and keeps track of strings
use std::collections::HashMap;
pub type IdType = u32;
#[derive(Clone, Debug)]
pub struct Translator {
strings: HashMap<String, IdType>,
last_id: IdType
}
impl Translator {
pub fn new() -> Self {
Translator { strings: HashMap::new(), last_id: 0 }
}
}
impl Translator {
pub fn convert<S: AsRef<str>>(&mut self, s: S) -> IdType {
*(self.strings.entry(s.as_ref().to_string()).or_insert({self.last_id += 1; self.last_id}))
}
}