Fix some incorrect references to patterns.

cubing · Aug 26, 2023 · b94d6f1 · b94d6f1
1 parent 84d2146
commit b94d6f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/cpp/rs/search.rs b/src/cpp/rs/search.rs
@@ -127,7 +127,7 @@ pub fn main_search(
                         Some(&KPuzzleSerializationOptions {
                             move_subset: None,
                             // move_subset: move_subset.clone(), // TODO
-                            custom_default_pattern,
+                            custom_start_pattern: custom_default_pattern,
                         }),
                     );
                     def.map_err(|e| e.to_string())

diff --git a/src/cpp/rs/serialize.rs b/src/cpp/rs/serialize.rs
@@ -154,7 +154,7 @@ pub fn serialize_scramble_kpattern_data(
 
 pub struct KPuzzleSerializationOptions {
     pub move_subset: Option<Vec<Move>>,
-    pub custom_default_pattern: Option<KPatternData>,
+    pub custom_start_pattern: Option<KPatternData>,
 }
 
 pub fn serialize_kpuzzle_definition(
@@ -166,7 +166,7 @@ pub fn serialize_kpuzzle_definition(
 
     let options = options.unwrap_or(&KPuzzleSerializationOptions {
         move_subset: None,
-        custom_default_pattern: None,
+        custom_start_pattern: None,
     });
     let mut builder = LiteStringBuilder::new();
 
@@ -184,8 +184,8 @@ pub fn serialize_kpuzzle_definition(
     builder.push(BLANK_LINE);
 
     builder.push("StartState");
-    if let Some(default_pattern) = &options.custom_default_pattern {
-        builder.push(&serialize_kpattern_data(Some(&kpuzzle), default_pattern)?);
+    if let Some(start_pattern) = &options.custom_start_pattern {
+        builder.push(&serialize_kpattern_data(Some(&kpuzzle), start_pattern)?);
     } else {
         builder.push(&serialize_kpattern_data(
             Some(&kpuzzle),

diff --git a/src/cpp/rs/serve.rs b/src/cpp/rs/serve.rs
@@ -54,11 +54,11 @@ struct KPatternSolve {
     definition: KPuzzleDefinition,
     pattern: KPatternData,
     move_subset: Option<Vec<Move>>,
-    default_pattern: Option<KPatternData>,
+    start_pattern: Option<KPatternData>,
     search_args: Option<ServeClientArgs>,
 }
 
-fn solve_position(request: &Request, serve_command_args: &ServeCommandArgs) -> Response {
+fn solve_pattern(request: &Request, serve_command_args: &ServeCommandArgs) -> Response {
     let kpattern_solve: KPatternSolve = try_or_400!(rouille::input::json_input(request));
     let args_for_individual_search = ServeArgsForIndividualSearch {
         commandline_args: serve_command_args,
@@ -69,7 +69,7 @@ fn solve_position(request: &Request, serve_command_args: &ServeCommandArgs) -> R
         kpattern_solve.definition,
         &KPuzzleSerializationOptions {
             move_subset: kpattern_solve.move_subset,
-            custom_default_pattern: kpattern_solve.default_pattern,
+            custom_start_pattern: kpattern_solve.start_pattern,
         },
     ) {
         Ok(_) => {}
@@ -120,7 +120,7 @@ Use with one of the following:
             },
             (POST) (/v0/solve/pattern) => { // TODO: `…/pattern`?
                 if let Ok(guard) = solve_mutex.try_lock() {
-                    let response = solve_position(request, &serve_command_args);
+                    let response = solve_pattern(request, &serve_command_args);
                     drop(guard);
                     response
                 } else {