rename reducible to get_option_and_score; derive Clone for PointingIn…

…fo & ClaimingInfo

src/solver/advanced.rs

@@ -78,14 +78,14 @@ where
         }
 
         let reducing_techniques = [
-            Pointing::reducible,
-            Claiming::reducible,
-            NakedPairRow::reducible,
-            NakedPairColumn::reducible,
-            NakedPairBlock::reducible,
-            HiddenPairRow::reducible,
-            HiddenPairColumn::reducible,
-            HiddenPairBlock::reducible,
+            Pointing::get_option_and_score,
+            Claiming::get_option_and_score,
+            NakedPairRow::get_option_and_score,
+            NakedPairColumn::get_option_and_score,
+            NakedPairBlock::get_option_and_score,
+            HiddenPairRow::get_option_and_score,
+            HiddenPairColumn::get_option_and_score,
+            HiddenPairBlock::get_option_and_score,
         ];
         // TODO: Triplet, Fish
 

src/techniques.rs

@@ -14,9 +14,6 @@ pub trait Direct<T>: Technique<T> + Into<Option<DirectOption>>
 where
     T: State,
 {
-    fn to_option(self) -> Option<DirectOption> {
-        self.into()
-    }
     fn get_option_and_score(state: &T) -> Option<(DirectOption, f32)> {
         let res = Self::check(state);
         let score = res.score();
@@ -30,14 +27,11 @@ pub trait ReducingCandidates<T>: Technique<T> + Into<Option<ReducingCandidatesOp
 where
     T: State,
 {
-    fn to_option(self) -> Option<ReducingCandidatesOption> {
-        self.into()
-    }
     // 如果返回值为 Some(ReducingCandidatesOption(removes), score)，
     // 对于 removes 中的任意元素 (cells, nums)，
     // cells 与 nums 中元素的笛卡尔积为所有的移除对，
     // 即：可以从 cells 中的任意格的候选数中移除 nums 中的任意数
-    fn reducible(state: &T) -> Option<(ReducingCandidatesOption, f32)> {
+    fn get_option_and_score(state: &T) -> Option<(ReducingCandidatesOption, f32)> {
         let res = Self::check(state);
         let score = res.score();
         res.into().map(|v| (v, score))

src/techniques/locked_candidates.rs

@@ -5,7 +5,7 @@ use crate::{
 
 use super::{House, ReducingCandidates, ReducingCandidatesOption, Technique};
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct PointingInfo {
     pub block: usize,
     pub rem_house: House,
@@ -90,7 +90,7 @@ impl<T> ReducingCandidates<T> for Pointing where
 {
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct ClaimingInfo {
     pub house: House,
     pub rem_block: usize,