Some more code cleanup

Author: FFMG

src/neuralnetwork/neuralnetworkserializer.cpp

@@ -935,28 +935,28 @@ NeuralNetworkOptions NeuralNetworkSerializer::get_and_build_options(const TinyJS
   const auto learning_rate_warmup_start = options_object->get_or<double>("learning-rate-warmup-start", 0.0);
   const auto learning_rate_warmup_target = options_object->get_or<double>("learning-rate-warmup-target", 0.0);
 
-  const auto number_of_epoch = options_object->get<int>("number-of-epoch");
-  const auto batch_size = options_object->get<int>("batch-size");
-  const auto data_is_unique = options_object->get<bool>("data-is-unique");
+  const auto number_of_epoch = static_cast<int>(options_object->get_or<long long>("number-of-epoch", 1));
+  const auto batch_size = static_cast<int>(options_object->get_or<long long>("batch-size", 1));
+  const auto data_is_unique = options_object->get_or<bool>("data-is-unique", false);
   const auto number_of_threads = options_object->get_or<int>("number-of-threads", 0);
   const auto learning_rate_decay_rate = options_object->get_or<double>("learning-rate-decay-rate", 0.0);
-  const auto adaptive_learning_rate = options_object->get<bool>("adaptive-learning-rate");
+  const auto adaptive_learning_rate = options_object->get_or<bool>("adaptive-learning-rate", false);
   const auto optimiser_type_string = options_object->try_get_string("optimiser-type");
   (void)optimiser_type_string;
 
   const auto learning_rate_restart_rate = options_object->get_or<double>("learning-rate-restart-rate", 0.0);
   const auto learning_rate_restart_boost = options_object->get_or<double>("learning-rate-restart-boost", 0.0);
-  const auto residual_layer_jump = options_object->get<int>("residual-layer-jump");
+  const auto residual_layer_jump = static_cast<int>(options_object->get_or<long long>("residual-layer-jump", -1));
   const auto clip_threshold = options_object->get_or<double>("clip-threshold", 1.0);
-  const auto shuffle_training_data = options_object->get<bool>("shuffle-training-data");
+  const auto shuffle_training_data = options_object->get_or<bool>("shuffle-training-data", true);
   const auto hidden_layers = get_hidden_layers(*options_object);
   const auto output_layer_details = get_output_layer_details(*options_object);
   const auto multi_output_layer_details = get_multi_output_layer_details(*options_object);
 
-  const auto enable_bptt = options_object->get<bool>("enable-bptt");
+  const auto enable_bptt = options_object->get_or<bool>("enable-bptt", false);
   const auto bptt_max_ticks = options_object->get_or<int>("bptt-max-ticks", 0);
-  const auto shuffle_bptt_batches = options_object->get<bool>("shuffle-bptt-batches");
-  const auto has_bias = options_object->get<bool>("has-bias");
+  const auto shuffle_bptt_batches = options_object->get_or<bool>("shuffle-bptt-batches", true);
+  const auto has_bias = options_object->get_or<bool>("has-bias", true);
 
   const auto output_error_calculation_type_string = options_object->try_get_string("output-error-calculation-type");
   (void)output_error_calculation_type_string;