feat!: simple and minimal operator syntax

Author: MilesCranmer

README.md

@@ -64,8 +64,7 @@ fn main() {
 
     let dataset = Dataset::new(x, y);
 
-    let operators = Operators::<D>::from_names_by_arity::<BuiltinOpsF32>(&["cos", "exp", "sin"], &["+", "-", "*", "/"], &[])
-        .unwrap();
+    let operators = BuiltinOpsF32::from_names(["cos", "exp", "sin", "+", "sub", "*", "/"]).unwrap();
 
     let options = Options::<f32, D> {
         operators,
@@ -103,7 +102,6 @@ Define custom operators with `op!`, then build an operator set with `opset!`:
 
 ```rust
 use symbolic_regression::prelude::*;
-use symbolic_regression::{op, opset};
 
 op!(Square for f64 {
     eval: |[x]| { x * x },
@@ -131,13 +129,15 @@ op!(Sub for f64 {
 });
 
 opset! {
-    pub struct CustomOps<f64> {
-        1 => { Square, Exp }
-        2 => { Add, Sub }
+    pub CustomOps for f64 {
+        Square,
+        Exp,
+        Add,
+        Sub,
     }
 }
 
-let operators = CustomOps::from_names_by_arity([&["square", "exp"], &["add", "sub"]]).unwrap();
+let operators = CustomOps::from_names(["square", "exp", "add", "sub"]).unwrap();
 let options = Options::<f64, _> { operators, ..Default::default() };
 ```
 

dynamic_expressions/benches/eval.rs

@@ -15,17 +15,11 @@ const N_TREES: usize = 100;
 const N_ROWS: usize = 1_000;
 
 opset! {
-    pub struct BenchOpsF32<f32> {
-        1 => { Cos, Exp }
-        2 => { Add, Sub, Mul, Div }
-    }
+    pub BenchOpsF32 for f32 { Cos, Exp, Add, Sub, Mul, Div }
 }
 
 opset! {
-    pub struct BenchOpsF64<f64> {
-        1 => { Cos, Exp }
-        2 => { Add, Sub, Mul, Div }
-    }
+    pub BenchOpsF64 for f64 { Cos, Exp, Add, Sub, Mul, Div }
 }
 
 fn random_leaf<T: Float, R: Rng>(rng: &mut R, n_features: usize, consts: &mut Vec<T>) -> PNode {

dynamic_expressions/src/lib.rs

@@ -12,6 +12,7 @@ pub mod operator_enum;
 pub mod operators;
 #[cfg(feature = "proptest-utils")]
 pub mod proptest_utils;
+pub mod select;
 pub mod simplify;
 pub mod strings;
 pub mod traits;
@@ -31,6 +32,7 @@ pub use crate::node_utils::{
     count_constant_nodes, count_depth, count_nodes, has_constants, has_operators, subtree_range, subtree_sizes,
     tree_mapreduce,
 };
+pub use crate::select::{OperatorSelectError, Operators};
 pub use crate::simplify::{combine_operators_in_place, simplify_in_place, simplify_tree_in_place};
 pub use crate::strings::{StringTreeOptions, print_tree, string_tree};
 pub use crate::traits::{HasOp, LookupError, OpId, OpMeta, OpTag, Operator, OperatorSet};