equal
deleted
inserted
replaced
286 data_domain: Set[String], |
286 data_domain: Set[String], |
287 data_iterator: Set[String] => Iterator[A], |
287 data_iterator: Set[String] => Iterator[A], |
288 old_data: Map[String, A] |
288 old_data: Map[String, A] |
289 ): Map[String, A] = { |
289 ): Map[String, A] = { |
290 val dom = data_domain -- old_data.keysIterator |
290 val dom = data_domain -- old_data.keysIterator |
291 val data = old_data -- old_data.keysIterator.filterNot(dom) |
291 val data = old_data -- old_data.keysIterator.filterNot(data_domain) |
292 if (dom.isEmpty) data |
292 if (dom.isEmpty) data |
293 else data_iterator(dom).foldLeft(data) { case (map, a) => map + (a.name -> a) } |
293 else data_iterator(dom).foldLeft(data) { case (map, a) => map + (a.name -> a) } |
294 } |
294 } |
295 |
295 |
296 def pull0[A <: Library.Named]( |
296 def pull0[A <: Library.Named]( |