submit command extracts a-number

Author: ckrause

CHANGELOG.md

@@ -2,15 +2,18 @@ To install or update LODA, please follow the [installation instructions](https:/
 
 ## [Unreleased]
 
-### Enhancements
-
-* Incremental evaluation (IE) partially supports programs with non-commutative updates of output cells. IE is supported for 5200 programs now.
-* Store default values in `setup.txt`
+## v22.3.11
 
 ### Features
 
 * Parallel mining with custom number of instances: `-P <number>`
 * Short-hand parameter for b-file output with offset 0: `-b`
+* `submit` command extracts A-number from comment in programs
+
+### Enhancements
+
+* Incremental evaluation (IE) partially supports programs with non-commutative updates of output cells. IE is supported for 5200 programs now.
+* Store default values in `setup.txt`
 
 ## v22.2.17
 

README.md

@@ -26,7 +26,7 @@ To mine programs for OEIS sequences, you can run `loda mine` (single-core) or `l
 The `loda` command-line tool provides the following commands and options:
 
 ```
-Welcome to LODA developer version. More information at https://loda-lang.org
+Welcome to LODA developer version. More information at https://loda-lang.org/
 
 Usage: loda <command> <options>
 
@@ -37,9 +37,9 @@ Core Commands:
   setup               Run interactive setup to configure LODA
 
 OEIS Commands:
-  mine                Mine programs for OEIS sequences (see -i)
+  mine                Mine programs for OEIS sequences (see -i,-p)
   check <id>          Check a program for an OEIS sequence (see -b)
-  submit <id> <file>  Submit a program for an OEIS sequence
+  submit <file> [id]  Submit a program for an OEIS sequence
 
 Targets:
   <file>              Path to a LODA file (file extension: *.asm)
@@ -48,12 +48,15 @@ Targets:
 
 Options:
   -t <number>         Number of sequence terms (default: 10)
-  -b <number>         Print result in b-file format from a given offset
+  -b                  Print result in b-file format from offset 0
+  -B <number>         Print result in b-file format from a custom offset
   -s                  Evaluate program to number of execution steps
   -c <number>         Maximum number of interpreter cycles (no limit: -1)
   -m <number>         Maximum number of used memory cells (no limit: -1)
   -l <string>         Log level (values: debug,info,warn,error,alert)
   -i <string>         Name of miner configuration from miners.json
+  -p                  Parallel mining using default number of instances
+  -P <number>         Parallel mining using custom number of instances
 ```
 
 ### Core Commands

src/commands.cpp

@@ -52,7 +52,7 @@ void Commands::help() {
   std::cout << "  check <id>          Check a program for an OEIS sequence "
                "(see -b)"
             << std::endl;
-  std::cout << "  submit <id> <file>  Submit a program for an OEIS sequence"
+  std::cout << "  submit <file> [id]  Submit a program for an OEIS sequence"
             << std::endl;
   std::cout << std::endl << "Targets:" << std::endl;
   std::cout
@@ -168,10 +168,10 @@ void Commands::mine() {
   miner.mine();
 }
 
-void Commands::submit(const std::string& id, const std::string& path) {
+void Commands::submit(const std::string& path, const std::string& id) {
   initLog(false);
   Miner miner(settings);
-  miner.submit(id, path);
+  miner.submit(path, id);
 }
 
 // hidden commands (only in development versions)

src/include/commands.hpp

@@ -24,7 +24,7 @@ class Commands {
 
   void mine();
 
-  void submit(const std::string& id, const std::string& path);
+  void submit(const std::string& path, const std::string& id);
 
   // hidden commands (only in development versions)
 

src/include/miner.hpp

@@ -28,7 +28,7 @@ class Miner {
 
   void mine();
 
-  void submit(const std::string &id, const std::string &path);
+  void submit(const std::string &path, std::string id);
 
  private:
   void checkRegularTasks();

src/main.cpp

@@ -125,11 +125,14 @@ int dispatch(Settings settings, const std::vector<std::string>& args) {
       commands.mine();
     }
   } else if (cmd == "submit") {
-    if (args.size() != 3) {
+    if (args.size() == 2) {
+      commands.submit(args.at(1), "");
+    } else if (args.size() == 3) {
+      commands.submit(args.at(1), args.at(2));
+    } else {
       std::cout << "invalid number of arguments" << std::endl;
       return 1;
     }
-    commands.submit(args.at(1), args.at(2));
   }
 #ifdef _WIN64
   // hidden helper command for updates on windows

src/miner.cpp

@@ -205,11 +205,18 @@ void Miner::checkRegularTasks() {
   }
 }
 
-void Miner::submit(const std::string &id, const std::string &path) {
+void Miner::submit(const std::string &path, std::string id) {
   Parser parser;
   auto program = parser.parse(path);
   ConfigLoader::MAINTAINANCE_MODE = true;
   reload();
+  if (id.empty() && program.ops.size() > 0 && !program.ops[0].comment.empty()) {
+    id = program.ops[0].comment;
+    auto n = id.find(':');
+    if (n != std::string::npos) {
+      id = id.substr(0, n);
+    }
+  }
   OeisSequence seq(id);
   Settings settings(this->settings);
   settings.print_as_b_file = false;