mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-21 08:43:03 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Use more override specifiers

Browse Source 
Now all methods which override Network methods use the override specifier.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-05-02 21:20:36 +02:00
parent bf9b72c62b
commit dc3d28ccd7
7 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lstm/convolve.h
View File

@ -37,7 +37,7 @@ class Convolve : public Network {
Convolve(const STRING& name, int ni, int half_x, int half_y); Convolve(const STRING& name, int ni, int half_x, int half_y);
virtual ~Convolve(); virtual ~Convolve();
virtual STRING spec() const { STRING spec() const override {
STRING spec; STRING spec;
spec.add_str_int("C", half_x_ * 2 + 1); spec.add_str_int("C", half_x_ * 2 + 1);
spec.add_str_int(",", half_y_ * 2 + 1); spec.add_str_int(",", half_y_ * 2 + 1);
@ -45,21 +45,21 @@ class Convolve : public Network {
} }
// Writes to the given file. Returns false in case of error. // Writes to the given file. Returns false in case of error.
virtual bool Serialize(TFile* fp) const; bool Serialize(TFile* fp) const override;
// Reads from the given file. Returns false in case of error. // Reads from the given file. Returns false in case of error.
virtual bool DeSerialize(TFile* fp); bool DeSerialize(TFile* fp) override;
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
protected: protected:
// Serialized data. // Serialized data.

26
src/lstm/input.h
View File

@ -31,7 +31,7 @@ class Input : public Network {
Input(const STRING& name, const StaticShape& shape); Input(const STRING& name, const StaticShape& shape);
virtual ~Input(); virtual ~Input();
virtual STRING spec() const { STRING spec() const override {
STRING spec; STRING spec;
spec.add_str_int("", shape_.batch()); spec.add_str_int("", shape_.batch());
spec.add_str_int(",", shape_.height()); spec.add_str_int(",", shape_.height());
@ -41,17 +41,17 @@ class Input : public Network {
} }
// Returns the required shape input to the network. // Returns the required shape input to the network.
virtual StaticShape InputShape() const { return shape_; } StaticShape InputShape() const override { return shape_; }
// Returns the shape output from the network given an input shape (which may // Returns the shape output from the network given an input shape (which may
// be partially unknown ie zero). // be partially unknown ie zero).
virtual StaticShape OutputShape(const StaticShape& input_shape) const { StaticShape OutputShape(const StaticShape& input_shape) const override {
return shape_; return shape_;
} }
// Writes to the given file. Returns false in case of error. // Writes to the given file. Returns false in case of error.
// Should be overridden by subclasses, but called by their Serialize. // Should be overridden by subclasses, but called by their Serialize.
virtual bool Serialize(TFile* fp) const; bool Serialize(TFile* fp) const override;
// Reads from the given file. Returns false in case of error. // Reads from the given file. Returns false in case of error.
virtual bool DeSerialize(TFile* fp); bool DeSerialize(TFile* fp) override;
// Returns an integer reduction factor that the network applies to the // Returns an integer reduction factor that the network applies to the
// time sequence. Assumes that any 2-d is already eliminated. Used for // time sequence. Assumes that any 2-d is already eliminated. Used for
@ -59,23 +59,23 @@ class Input : public Network {
// WARNING: if GlobalMinimax is used to vary the scale, this will return // WARNING: if GlobalMinimax is used to vary the scale, this will return
// the last used scale factor. Call it before any forward, and it will return // the last used scale factor. Call it before any forward, and it will return
// the minimum scale factor of the paths through the GlobalMinimax. // the minimum scale factor of the paths through the GlobalMinimax.
virtual int XScaleFactor() const; int XScaleFactor() const override;
// Provides the (minimum) x scale factor to the network (of interest only to // Provides the (minimum) x scale factor to the network (of interest only to
// input units) so they can determine how to scale bounding boxes. // input units) so they can determine how to scale bounding boxes.
virtual void CacheXScaleFactor(int factor); void CacheXScaleFactor(int factor) override;
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
// Creates and returns a Pix of appropriate size for the network from the // Creates and returns a Pix of appropriate size for the network from the
// image_data. If non-null, *image_scale returns the image scale factor used. // image_data. If non-null, *image_scale returns the image scale factor used.
// Returns nullptr on error. // Returns nullptr on error.

16
src/lstm/maxpool.h
View File

@ -32,7 +32,7 @@ class Maxpool : public Reconfig {
virtual ~Maxpool(); virtual ~Maxpool();
// Accessors. // Accessors.
virtual STRING spec() const { STRING spec() const override {
STRING spec; STRING spec;
spec.add_str_int("Mp", y_scale_); spec.add_str_int("Mp", y_scale_);
spec.add_str_int(",", x_scale_); spec.add_str_int(",", x_scale_);
@ -40,19 +40,19 @@ class Maxpool : public Reconfig {
} }
// Reads from the given file. Returns false in case of error. // Reads from the given file. Returns false in case of error.
virtual bool DeSerialize(TFile* fp); bool DeSerialize(TFile* fp) override;
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
private: private:
// Memory of which input was the max. // Memory of which input was the max.

16
src/lstm/parallel.h
View File

@ -32,9 +32,9 @@ class Parallel : public Plumbing {
// Returns the shape output from the network given an input shape (which may // Returns the shape output from the network given an input shape (which may
// be partially unknown ie zero). // be partially unknown ie zero).
virtual StaticShape OutputShape(const StaticShape& input_shape) const; StaticShape OutputShape(const StaticShape& input_shape) const override;
virtual STRING spec() const { STRING spec() const override {
STRING spec; STRING spec;
if (type_ == NT_PAR_2D_LSTM) { if (type_ == NT_PAR_2D_LSTM) {
// We have 4 LSTMs operating in parallel here, so the size of each is // We have 4 LSTMs operating in parallel here, so the size of each is
@ -63,15 +63,15 @@ class Parallel : public Plumbing {
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
private: private:
// If *this is a NT_REPLICATED, then it feeds a replicated network with // If *this is a NT_REPLICATED, then it feeds a replicated network with

22
src/lstm/reconfig.h
View File

@ -37,9 +37,9 @@ class Reconfig : public Network {
// Returns the shape output from the network given an input shape (which may // Returns the shape output from the network given an input shape (which may
// be partially unknown ie zero). // be partially unknown ie zero).
virtual StaticShape OutputShape(const StaticShape& input_shape) const; StaticShape OutputShape(const StaticShape& input_shape) const override;
virtual STRING spec() const { STRING spec() const override {
STRING spec; STRING spec;
spec.add_str_int("S", y_scale_); spec.add_str_int("S", y_scale_);
spec.add_str_int(",", x_scale_); spec.add_str_int(",", x_scale_);
@ -52,24 +52,24 @@ class Reconfig : public Network {
// WARNING: if GlobalMinimax is used to vary the scale, this will return // WARNING: if GlobalMinimax is used to vary the scale, this will return
// the last used scale factor. Call it before any forward, and it will return // the last used scale factor. Call it before any forward, and it will return
// the minimum scale factor of the paths through the GlobalMinimax. // the minimum scale factor of the paths through the GlobalMinimax.
virtual int XScaleFactor() const; int XScaleFactor() const override;
// Writes to the given file. Returns false in case of error. // Writes to the given file. Returns false in case of error.
virtual bool Serialize(TFile* fp) const; bool Serialize(TFile* fp) const override;
// Reads from the given file. Returns false in case of error. // Reads from the given file. Returns false in case of error.
virtual bool DeSerialize(TFile* fp); bool DeSerialize(TFile* fp) override;
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
protected: protected:
// Non-serialized data used to store parameters between forward and back. // Non-serialized data used to store parameters between forward and back.

16
src/lstm/reversed.h
View File

@ -32,9 +32,9 @@ class Reversed : public Plumbing {
// Returns the shape output from the network given an input shape (which may // Returns the shape output from the network given an input shape (which may
// be partially unknown ie zero). // be partially unknown ie zero).
virtual StaticShape OutputShape(const StaticShape& input_shape) const; StaticShape OutputShape(const StaticShape& input_shape) const override;
virtual STRING spec() const { STRING spec() const override {
STRING spec(type_ == NT_XREVERSED ? "Rx" STRING spec(type_ == NT_XREVERSED ? "Rx"
: (type_ == NT_YREVERSED ? "Ry" : "Txy")); : (type_ == NT_YREVERSED ? "Ry" : "Txy"));
// For most simple cases, we will output Rx<net> or Ry<net> where <net> is // For most simple cases, we will output Rx<net> or Ry<net> where <net> is
@ -69,15 +69,15 @@ class Reversed : public Plumbing {
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
// Runs backward propagation of errors on the deltas line. // Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual bool Backward(bool debug, const NetworkIO& fwd_deltas, bool Backward(bool debug, const NetworkIO& fwd_deltas,
NetworkScratch* scratch, NetworkScratch* scratch,
NetworkIO* back_deltas); NetworkIO* back_deltas) override;
private: private:
// Copies src to *dest with the reversal according to type_. // Copies src to *dest with the reversal according to type_.

16
src/lstm/tfnetwork.h
View File

@ -39,14 +39,14 @@ class TFNetwork : public Network {
virtual ~TFNetwork(); virtual ~TFNetwork();
// Returns the required shape input to the network. // Returns the required shape input to the network.
virtual StaticShape InputShape() const { return input_shape_; } StaticShape InputShape() const override { return input_shape_; }
// Returns the shape output from the network given an input shape (which may // Returns the shape output from the network given an input shape (which may
// be partially unknown ie zero). // be partially unknown ie zero).
virtual StaticShape OutputShape(const StaticShape& input_shape) const { StaticShape OutputShape(const StaticShape& input_shape) const override {
return output_shape_; return output_shape_;
} }
virtual STRING spec() const { return spec_.c_str(); } STRING spec() const override { return spec_.c_str(); }
// Deserializes *this from a serialized TFNetwork proto. Returns 0 if failed, // Deserializes *this from a serialized TFNetwork proto. Returns 0 if failed,
// otherwise the global step of the serialized graph. // otherwise the global step of the serialized graph.
@ -57,16 +57,16 @@ class TFNetwork : public Network {
// Writes to the given file. Returns false in case of error. // Writes to the given file. Returns false in case of error.
// Should be overridden by subclasses, but called by their Serialize. // Should be overridden by subclasses, but called by their Serialize.
virtual bool Serialize(TFile* fp) const; bool Serialize(TFile* fp) const override;
// Reads from the given file. Returns false in case of error. // Reads from the given file. Returns false in case of error.
// Should be overridden by subclasses, but NOT called by their DeSerialize. // Should be overridden by subclasses, but NOT called by their DeSerialize.
virtual bool DeSerialize(TFile* fp); bool DeSerialize(TFile* fp) override;
// Runs forward propagation of activations on the input line. // Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments. // See Network for a detailed discussion of the arguments.
virtual void Forward(bool debug, const NetworkIO& input, void Forward(bool debug, const NetworkIO& input,
const TransposedArray* input_transpose, const TransposedArray* input_transpose,
NetworkScratch* scratch, NetworkIO* output); NetworkScratch* scratch, NetworkIO* output) override;
private: private:
int InitFromProto(); int InitFromProto();