small last-minute updates. just to satisfu CppCheck a it more

proycon · Jul 4, 2023 · 8c94663 · 8c94663
1 parent 8e869d3
commit 8c94663
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 34 deletions.
diff --git a/src/common.cpp b/src/common.cpp
@@ -2,6 +2,7 @@
 #include <glob.h>
 #include <sstream>
 #include <vector>
+#include <numeric>
 
 using namespace std;
 
@@ -32,19 +33,11 @@ bool strip_extension(std::string& filename, const std::string& extension) {
 }
 
 double listproduct(const vector<double> & l) {
- double p = 1;
- for ( const auto& iter : l ){
- p *= iter;
- }
- return p;
+ return std::accumulate( l.begin(), l.end(), 1, std::multiplies<double>() );
 }
 
 double listsum(const vector<double> & l) {
- double p = 0;
- for ( const auto& iter: l ){
- p += iter;
- }
- return p;
+ return std::accumulate( l.begin(), l.end(), 0 );
 }
 
 void orderedinsert(list<double> & l, double value) {

diff --git a/src/grep.cpp b/src/grep.cpp
@@ -39,31 +39,35 @@ int main( int argc, char *argv[] ) {
 
  char c;
  while ((c = getopt(argc, argv, "c:hf:i::l:r:s:")) != -1) {
- switch (c) {
- case 'c':
- classfile = optarg;
- break;
- case 'f':
- corpusfile = optarg;
- break;
- case 'i':
- modelfile = optarg;
- break;
- case 'l':
- leftcontextsize = atoi(optarg);
- break;
- case 'r':
- rightcontextsize = atoi(optarg);
- break;
- case 'h':
- usage();
- exit(0);
- default:
- cerr << "ERROR: Unknown option: -" << optopt << endl;
- abort ();
- }
+ switch (c) {
+ case 'c':
+ classfile = optarg;
+ break;
+ case 'f':
+ corpusfile = optarg;
+ break;
+ case 'i':
+ modelfile = optarg;
+ break;
+ case 'l':
+ leftcontextsize = atoi(optarg);
+ break;
+ case 'r':
+ rightcontextsize = atoi(optarg);
+ break;
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ cerr << "ERROR: Unknown option: -" << optopt << endl;
+ abort ();
+ }
+ }
+ if ( leftcontextsize != 0
+ || rightcontextsize != 0 ){
+ cerr << "Sorry, options '-l' and '-r' are nor implemented yet." << endl;
+ abort();
  }
-
  for (int i = optind; i < argc; i++) {
  string tmp = argv[i];
  querystrings.push_back(tmp);