Change CLI slightly

src/main.rs

@@ -5,7 +5,7 @@
 use clap::Parser;
 use rand::prelude::*;
 use crate::cli::{drive_system};
-use crate::cli::cli::{StickProbabilityCli, InitialCli, BallsCli, PCM, ModelCli, SurfaceProbabilityMeasureCli};
+use crate::cli::cli::{StickProbabilityCli, InitialCli, BallsCli, PCM, ModelCli, SurfaceProbabilityMeasureCli, KDStickProbabilityCli};
 use crate::cli::cli::PCM::Balls2d;
 use crate::cli::output::write;
 use crate::surface_probability_measure::{LoggerSticker, ReadOnlyVectorStorage};
@@ -57,7 +57,7 @@ fn main() {
             write(&sys, cli.format, &cli.output);
         }
 
-        PCM::Grid3KD(StickProbabilityCli { grid_size, stick_probability }) => {
+        PCM::Grid3d(KDStickProbabilityCli { stick_probability }) => {
             let mut sys = DLASystem::<_, Grid3D, _, _, _, _>::new(
                 SmallRng::seed_from_u64(cli.seed),
                 KDSpace::new(),
@@ -71,7 +71,7 @@ fn main() {
             write(&sys, cli.format, &cli.output);
         }
 
-        PCM::Grid3KDTsang(StickProbabilityCli { grid_size, stick_probability }) => {
+        PCM::Grid3dOffAxis(KDStickProbabilityCli { stick_probability }) => {
             let mut sys = DLASystem::<_, Grid3D, _, _, _, _>::new(
                 SmallRng::seed_from_u64(cli.seed),
                 KDSpace::new(),
@@ -85,20 +85,6 @@ fn main() {
             write(&sys, cli.format, &cli.output);
         }
 
-        PCM::Grid3(StickProbabilityCli { grid_size, stick_probability }) => {
-            let mut sys = DLASystem::<_, Grid3D, _, _, _, _>::new(
-                SmallRng::seed_from_u64(cli.seed),
-                VectorStorage::new(grid_size, 3),
-                LocalRandomWalker,
-                UniformSpawner,
-                ProbabilisticSticking::new(stick_probability).unwrap(),
-                cli.max_particles,
-            );
-
-            drive_system(&mut sys, cli.max_frames, cli.notify_every);
-            write(&sys, cli.format, &cli.output);
-        }
-
         PCM::Hex(StickProbabilityCli { grid_size, stick_probability }) => {
             let mut sys = DLASystem::<_, HexPosition, _, _, _, _>::new(
                 SmallRng::seed_from_u64(cli.seed),