options classes: fixed base

.gitignore

@@ -1,8 +1,4 @@
 .gitignore_src
 .ignore
 out/*.bin
-src/flat
-src/label
 src/lib/random.cpp
-src/nn
-src/train

README.md

@@ -3,7 +3,7 @@
 
 *dimensionality-recursive vector quantization*
 
-`drvq` is a C++ library implementation of [dimensionality-recursive vector quantization](http://image.ntua.gr/iva/research/drvq), a fast vector quantization method in high-dimensional Euclidean spaces under arbitrary data distributions. Usage of the software is only described here; for more information on the methods used please refer to the [DRVQ software page](http://image.ntua.gr/iva/tools/drvq), the [research project](http://image.ntua.gr/iva/research/drvq), or the original publication ([abstract](http://image.ntua.gr/iva/publications/qc), [PDF](http://image.ntua.gr/iva/files/qc.pdf)). The [latest stable release](https://sourceforge.net/projects/drvq/files/) is available for download at [SourceForge](https://sourceforge.net/projects/drvq/).
+`drvq` is a C++ library implementation of [dimensionality-recursive vector quantization](http://image.ntua.gr/iva/research/drvq), a fast vector quantization method in high-dimensional Euclidean spaces under arbitrary data distributions. Usage of the software is only described here; for more information on the methods used please refer to the [DRVQ software page](http://image.ntua.gr/iva/tools/drvq), the [research project](http://image.ntua.gr/iva/research/drvq), or the original publication ([abstract](http://image.ntua.gr/iva/publications/qc), [PDF](http://image.ntua.gr/iva/files/qc.pdf)). The [latest stable release](https://sourceforge.net/projects/drvq/files/) is available for download at [SourceForge](https://sourceforge.net/projects/drvq/), and the latest development version is at [github](https://github.com/iavr/drvq). This README file is better viewed online [here](https://github.com/iavr/drvq/blob/master/README.md).
 
 Licence
 -------

src/options/flat.hpp

@@ -57,7 +57,7 @@ struct flat_options
 
 struct flat_args : public cmd_args <flat_options, flat_args>
 {
-	typedef flat_options base;
+	typedef cmd_args <flat_options, flat_args> base;
 
 	template <typename C>
 	void args(C cmd)
@@ -66,7 +66,7 @@ struct flat_args : public cmd_args <flat_options, flat_args>
 		set(cmd, "book",       book,       "b",  "codebook file name");
 	}
 
-	flat_args(int argc, char* argv[]) : cmd_args(argc, argv) { done(); }
+	flat_args(int argc, char* argv[]) : base(argc, argv) { done(); }
 };
 
 //-----------------------------------------------------------------------------

src/options/label.hpp

@@ -66,7 +66,7 @@ struct label_options : public descriptor_options, public offline_options
 
 struct label_args : public cmd_args <label_options, label_args>
 {
-	typedef label_options base;
+	typedef cmd_args <label_options, label_args> base;
 
 	template <typename C>
 	void args(C cmd)
@@ -81,7 +81,7 @@ struct label_args : public cmd_args <label_options, label_args>
 		set(cmd, "range",      range,      "r",  "range of edge weights to explore in method 1 (> 0)");
 	}
 
-	label_args(int argc, char* argv[]) : cmd_args(argc, argv) { done(); }
+	label_args(int argc, char* argv[]) : base(argc, argv) { done(); }
 };
 
 //-----------------------------------------------------------------------------

src/options/nn.hpp

@@ -68,6 +68,8 @@ struct nn_options : public descriptor_options, public online_options
 
 struct nn_args : public cmd_args <nn_options, nn_args>
 {
+	typedef cmd_args <nn_options, nn_args> base;
+
 	template <typename C>
 	void args(C cmd)
 	{
@@ -85,7 +87,7 @@ struct nn_args : public cmd_args <nn_options, nn_args>
 		set(cmd, "rat_step",     rat_step,   "Hs", "distance ratio step");
 	}
 
-	nn_args(int argc, char* argv[]) : cmd_args(argc, argv) { done(); }
+	nn_args(int argc, char* argv[]) : base(argc, argv) { done(); }
 };
 
 //-----------------------------------------------------------------------------

src/options/search.hpp

@@ -71,6 +71,8 @@ struct search_options
 
 struct search_args : public cmd_args <search_options, search_args>
 {
+	typedef cmd_args <search_options, search_args> base;
+
 	template <typename C>
 	void args(C cmd)
 	{
@@ -86,7 +88,7 @@ struct search_args : public cmd_args <search_options, search_args>
 		set(cmd, "top",    top,    "t",  "number of top files to re-rank");
 	}
 
-	search_args(int argc, char* argv[]) : cmd_args(argc, argv) { done(); }
+	search_args(int argc, char* argv[]) : base(argc, argv) { done(); }
 };
 
 //-----------------------------------------------------------------------------

src/options/train.hpp

@@ -134,6 +134,8 @@ class train_options : public descriptor_options, public offline_options
 
 struct train_args : public cmd_args <train_options, train_args>
 {
+	typedef cmd_args <train_options, train_args> base;
+
 	template <typename C>
 	void args(C cmd)
 	{
@@ -150,7 +152,7 @@ struct train_args : public cmd_args <train_options, train_args>
 		set_capacity();
 	}
 
-	train_args(int argc, char* argv[]) : cmd_args(argc, argv) { done(); }
+	train_args(int argc, char* argv[]) : base(argc, argv) { done(); }
 };
 
 //-----------------------------------------------------------------------------