commit 13acec39e92f76925bcff923e0a972d9258dba43 · drubery.com/icfp2007

+4 -4

dna2rna/src/match_replace.rs

···

       11
       11
        
           groups: Vec<(usize, usize)>,

     

       12
       12
        
       }

     

       13
       13
        
       

     

       14
       14
       -
       fn do_match(dna: &DnaRef, start: usize, pattern: &Pattern) -> Option<MatchResult> {

     

       14
       14
       +
       fn do_match(dna: &DnaRef, start: usize, pattern: Pattern) -> Option<MatchResult> {

     

       15
       15
        
           let mut index = start;

     

       16
       16
        
           let mut env = Vec::new();

     

       17
       17
        
           let mut opens = Vec::new();

     

       18
       18
       -
           for p in pattern.iter() {

     

       18
       18
       +
           for p in pattern.into_iter() {

     

       19
       19
        
               match p {

     

       20
       20
        
                   PatternItem::Base(b) => {

     

       21
       21
       -
                       if index >= dna.len() || dna[index] != *b {

     

       21
       21
       +
                       if index >= dna.len() || dna[index] != b {

     

       22
       22
        
                           return None;

     

       23
       23
        
                       }

     

       24
       24
        
       

     
···

       123
       123
        
           let template = parser.template(rna)?;

     

       124
       124
        
           let index = parser.index();

     

       125
       125
        
       

     

       126
       126
       -
           if let Some(matched) = do_match(&dna, index, &pattern) {

     

       126
       126
       +
           if let Some(matched) = do_match(&dna, index, pattern) {

     

       127
       127
        
               let mut replace = DnaRef::new();

     

       128
       128
        
               for t in template.into_iter() {

     

       129
       129
        
                   match t {

+4 -4

dna2rna/src/parser.rs

···

       170
       170
        
                       || self.next_is(&[Base::I, Base::I, Base::F])

     

       171
       171
        
                   {

     

       172
       172
        
                       self.advance(3);

     

       173
       173
       -
                       return Some(ret);

     

       173
       173
       +
                       return Some(Template::new(ret));

     

       174
       174
        
                   } else if self.next_is(&[Base::I, Base::I, Base::P]) {

     

       175
       175
        
                       self.advance(3);

     

       176
       176
        
                       let n = self.nat()?;

     
···

       284
       284
        
               let mut parser = Parser::new(dna);

     

       285
       285
        
               assert_eq!(

     

       286
       286
        
                   parser.template(&mut rna),

     

       287
       287
       -
                   Some(vec![

     

       287
       287
       +
                   Some(Template::new(vec![

     

       288
       288
        
                       TemplateItem::Base(Base::I),

     

       289
       289
        
                       TemplateItem::Base(Base::C),

     

       290
       290
        
                       TemplateItem::Base(Base::F),

     

       291
       291
        
                       TemplateItem::Base(Base::P),

     

       292
       292
        
                       TemplateItem::Ref(2, 1),

     

       293
       293
        
                       TemplateItem::Len(4)

     

       294
       294
       -
                   ])

     

       294
       294
       +
                   ]))

     

       295
       295
        
               );

     

       296
       296
        
               assert_eq!(parser.index, 22);

     

       297
       297
        
       

     

       298
       298
        
               let dna = dna_from_str("IIIPFCICFPIIC").into_iter();

     

       299
       299
        
               let mut parser = Parser::new(dna);

     

       300
       300
       -
               assert_eq!(parser.template(&mut rna), Some(vec![]));

     

       300
       300
       +
               assert_eq!(parser.template(&mut rna), Some(Template::new(vec![])));

     

       301
       301
        
               assert_eq!(parser.index, 13);

     

       302
       302
        
               assert_eq!(

     

       303
       303
        
                   rna,

+7 -2

dna2rna/src/pattern.rs

···

       1
       1
        
       use crate::dna::Base;

     

       2
       2
        
       use std::fmt;

     

       3
       3
       -
       use std::slice::Iter;

     

       3
       3
       +
       use std::slice;

     

       4
       4
       +
       use std::vec;

     

       4
       5
        
       

     

       5
       6
        
       #[derive(Debug, PartialEq)]

     

       6
       7
        
       pub enum PatternItem {

     
···

       40
       41
        
               Pattern { pattern: pattern }

     

       41
       42
        
           }

     

       42
       43
        
       

     

       43
       43
       -
           pub fn iter<'a>(&'a self) -> Iter<'a, PatternItem> {

     

       44
       44
       +
           pub fn iter<'a>(&'a self) -> slice::Iter<'a, PatternItem> {

     

       44
       45
        
               self.pattern.iter()

     

       46
       46
       +
           }

     

       47
       47
       +
       

     

       48
       48
       +
           pub fn into_iter<'a>(self) -> vec::IntoIter<PatternItem> {

     

       49
       49
       +
               self.pattern.into_iter()

     

       45
       50
        
           }

     

       46
       51
        
       }

     

       47
       52

+80 -1

dna2rna/src/template.rs

···

       1
       1
        
       use crate::dna::Base;

     

       2
       2
       +
       use std::fmt;

     

       3
       3
       +
       use std::slice;

     

       4
       4
       +
       use std::vec;

     

       2
       5
        
       

     

       3
       6
        
       #[derive(Debug, PartialEq)]

     

       4
       7
        
       pub enum TemplateItem {

     
···

       7
       10
        
           Len(usize),

     

       8
       11
        
       }

     

       9
       12
        
       

     

       10
       10
       -
       pub type Template = Vec<TemplateItem>;

     

       13
       13
       +
       impl fmt::Display for TemplateItem {

     

       14
       14
       +
           fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

     

       15
       15
       +
               match &self {

     

       16
       16
       +
                   TemplateItem::Base(b) => write!(f, "{}", b.to_char()),

     

       17
       17
       +
                   TemplateItem::Ref(n, l) => {

     

       18
       18
       +
                       if *l == 0 {

     

       19
       19
       +
                           write!(f, "\"{}\"", n)

     

       20
       20
       +
                       } else {

     

       21
       21
       +
                           write!(f, "\"{},{}\"", n, l)

     

       22
       22
       +
                       }

     

       23
       23
       +
                   }

     

       24
       24
       +
                   TemplateItem::Len(n) => {

     

       25
       25
       +
                       write!(f, "|{}|", n)

     

       26
       26
       +
                   }

     

       27
       27
       +
               }

     

       28
       28
       +
           }

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       #[derive(Debug, PartialEq)]

     

       32
       32
       +
       pub struct Template {

     

       33
       33
       +
           template: Vec<TemplateItem>,

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       impl Template {

     

       37
       37
       +
           pub fn new(template: Vec<TemplateItem>) -> Template {

     

       38
       38
       +
               Template { template: template }

     

       39
       39
       +
           }

     

       40
       40
       +
       

     

       41
       41
       +
           pub fn iter<'a>(&'a self) -> slice::Iter<'a, TemplateItem> {

     

       42
       42
       +
               self.template.iter()

     

       43
       43
       +
           }

     

       44
       44
       +
       

     

       45
       45
       +
           pub fn into_iter<'a>(self) -> vec::IntoIter<TemplateItem> {

     

       46
       46
       +
               self.template.into_iter()

     

       47
       47
       +
           }

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       50
       50
       +
       impl fmt::Display for Template {

     

       51
       51
       +
           fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

     

       52
       52
       +
               for p in self.iter() {

     

       53
       53
       +
                   write!(f, "{}", p)?;

     

       54
       54
       +
               }

     

       55
       55
       +
               Ok(())

     

       56
       56
       +
           }

     

       57
       57
       +
       }

     

       58
       58
       +
       

     

       59
       59
       +
       #[cfg(test)]

     

       60
       60
       +
       mod tests {

     

       61
       61
       +
           use super::*;

     

       62
       62
       +
       

     

       63
       63
       +
           #[test]

     

       64
       64
       +
           fn test_display_base() {

     

       65
       65
       +
               assert_eq!(

     

       66
       66
       +
                   Template::new(vec![

     

       67
       67
       +
                       TemplateItem::Base(Base::I),

     

       68
       68
       +
                       TemplateItem::Base(Base::C),

     

       69
       69
       +
                       TemplateItem::Base(Base::F),

     

       70
       70
       +
                       TemplateItem::Base(Base::P)

     

       71
       71
       +
                   ])

     

       72
       72
       +
                   .to_string(),

     

       73
       73
       +
                   "ICFP"

     

       74
       74
       +
               );

     

       75
       75
       +
           }

     

       76
       76
       +
       

     

       77
       77
       +
           #[test]

     

       78
       78
       +
           fn test_display_ref() {

     

       79
       79
       +
               assert_eq!(

     

       80
       80
       +
                   Template::new(vec![TemplateItem::Ref(3, 2), TemplateItem::Ref(4, 0),]).to_string(),

     

       81
       81
       +
                   "\"3,2\"\"4\""

     

       82
       82
       +
               );

     

       83
       83
       +
           }

     

       84
       84
       +
       

     

       85
       85
       +
           #[test]

     

       86
       86
       +
           fn test_display_lenf() {

     

       87
       87
       +
               assert_eq!(Template::new(vec![TemplateItem::Len(3)]).to_string(), "|3|");

     

       88
       88
       +
           }

     

       89
       89
       +
       }