Removed unneeded derived class copy constructors and assignment operators
							parent
							
								
									5b15b11261
								
							
						
					
					
						commit
						731bfe4973
					
				| 
						 | 
				
			
			@ -99,17 +99,6 @@ namespace gtsam {
 | 
			
		|||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianBayesTree::GaussianBayesTree(const GaussianBayesTree& other) :
 | 
			
		||||
    Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianBayesTree& GaussianBayesTree::operator=(const GaussianBayesTree& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  bool GaussianBayesTree::equals(const This& other, double tol) const
 | 
			
		||||
  {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -59,14 +59,6 @@ namespace gtsam {
 | 
			
		|||
    /** Default constructor, creates an empty Bayes tree */
 | 
			
		||||
    GaussianBayesTree() {}
 | 
			
		||||
 | 
			
		||||
    /** Makes a deep copy of the tree structure, but only pointers to conditionals are
 | 
			
		||||
     *  copied, the conditionals and their matrices are not cloned. */
 | 
			
		||||
    GaussianBayesTree(const GaussianBayesTree& other);
 | 
			
		||||
 | 
			
		||||
    /** Makes a deep copy of the tree structure, but only pointers to conditionals are
 | 
			
		||||
     *  copied, the conditionals and their matrices are not cloned. */
 | 
			
		||||
    GaussianBayesTree& operator=(const GaussianBayesTree& other);
 | 
			
		||||
 | 
			
		||||
    /** Check equality */
 | 
			
		||||
    bool equals(const This& other, double tol = 1e-9) const;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,18 +35,6 @@ namespace gtsam {
 | 
			
		|||
    const GaussianFactorGraph& factorGraph, const Ordering& order) :
 | 
			
		||||
  Base(factorGraph, order) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianEliminationTree::GaussianEliminationTree(
 | 
			
		||||
    const This& other) :
 | 
			
		||||
  Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianEliminationTree& GaussianEliminationTree::operator=(const This& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  bool GaussianEliminationTree::equals(const This& other, double tol) const
 | 
			
		||||
  {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -51,14 +51,6 @@ namespace gtsam {
 | 
			
		|||
    GaussianEliminationTree(const GaussianFactorGraph& factorGraph,
 | 
			
		||||
      const Ordering& order);
 | 
			
		||||
 | 
			
		||||
    /** Copy constructor - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    GaussianEliminationTree(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Assignment operator - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    This& operator=(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Test whether the tree is equal to another */
 | 
			
		||||
    bool equals(const This& other, double tol = 1e-9) const;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,15 +30,4 @@ namespace gtsam {
 | 
			
		|||
    const GaussianEliminationTree& eliminationTree) :
 | 
			
		||||
  Base(Base::FromEliminationTree(eliminationTree)) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianJunctionTree::GaussianJunctionTree(const This& other) :
 | 
			
		||||
    Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  GaussianJunctionTree& GaussianJunctionTree::operator=(const This& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,14 +61,6 @@ namespace gtsam {
 | 
			
		|||
    * @return The elimination tree
 | 
			
		||||
    */
 | 
			
		||||
    GaussianJunctionTree(const GaussianEliminationTree& eliminationTree);
 | 
			
		||||
 | 
			
		||||
    /** Copy constructor - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    GaussianJunctionTree(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Assignment operator - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    This& operator=(const This& other);
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,17 +31,6 @@ namespace gtsam {
 | 
			
		|||
  template class BayesTreeCliqueBase<SymbolicBayesTreeClique, SymbolicFactorGraph>;
 | 
			
		||||
  template class BayesTree<SymbolicBayesTreeClique>;
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicBayesTree::SymbolicBayesTree(const SymbolicBayesTree& other) :
 | 
			
		||||
    Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicBayesTree& SymbolicBayesTree::operator=(const SymbolicBayesTree& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */\
 | 
			
		||||
  bool SymbolicBayesTree::equals(const This& other, double tol /* = 1e-9 */) const
 | 
			
		||||
  {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,14 +58,6 @@ namespace gtsam {
 | 
			
		|||
    /** Default constructor, creates an empty Bayes tree */
 | 
			
		||||
    SymbolicBayesTree() {}
 | 
			
		||||
 | 
			
		||||
    /** Makes a deep copy of the tree structure, but only pointers to conditionals are
 | 
			
		||||
     *  copied, the conditionals and their matrices are not cloned. */
 | 
			
		||||
    SymbolicBayesTree(const SymbolicBayesTree& other);
 | 
			
		||||
 | 
			
		||||
    /** Makes a deep copy of the tree structure, but only pointers to conditionals are
 | 
			
		||||
     *  copied, the conditionals and their matrices are not cloned. */
 | 
			
		||||
    SymbolicBayesTree& operator=(const SymbolicBayesTree& other);
 | 
			
		||||
 | 
			
		||||
    /** check equality */
 | 
			
		||||
    bool equals(const This& other, double tol = 1e-9) const;
 | 
			
		||||
  };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,18 +35,6 @@ namespace gtsam {
 | 
			
		|||
    const SymbolicFactorGraph& factorGraph, const Ordering& order) :
 | 
			
		||||
  Base(factorGraph, order) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicEliminationTree::SymbolicEliminationTree(
 | 
			
		||||
    const This& other) :
 | 
			
		||||
  Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicEliminationTree& SymbolicEliminationTree::operator=(const This& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  bool SymbolicEliminationTree::equals(const This& other, double tol) const
 | 
			
		||||
  {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,14 +47,6 @@ namespace gtsam {
 | 
			
		|||
    SymbolicEliminationTree(const SymbolicFactorGraph& factorGraph,
 | 
			
		||||
      const Ordering& order);
 | 
			
		||||
 | 
			
		||||
    /** Copy constructor - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    SymbolicEliminationTree(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Assignment operator - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    This& operator=(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Test whether the tree is equal to another */
 | 
			
		||||
    bool equals(const This& other, double tol = 1e-9) const;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,15 +30,4 @@ namespace gtsam {
 | 
			
		|||
    const SymbolicEliminationTree& eliminationTree) :
 | 
			
		||||
  Base(Base::FromEliminationTree(eliminationTree)) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicJunctionTree::SymbolicJunctionTree(const This& other) :
 | 
			
		||||
    Base(other) {}
 | 
			
		||||
 | 
			
		||||
  /* ************************************************************************* */
 | 
			
		||||
  SymbolicJunctionTree& SymbolicJunctionTree::operator=(const This& other)
 | 
			
		||||
  {
 | 
			
		||||
    (void) Base::operator=(other);
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,14 +61,6 @@ namespace gtsam {
 | 
			
		|||
    * @return The elimination tree
 | 
			
		||||
    */
 | 
			
		||||
    SymbolicJunctionTree(const SymbolicEliminationTree& eliminationTree);
 | 
			
		||||
 | 
			
		||||
    /** Copy constructor - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    SymbolicJunctionTree(const This& other);
 | 
			
		||||
 | 
			
		||||
    /** Assignment operator - makes a deep copy of the tree structure, but only pointers to factors are
 | 
			
		||||
     *  copied, factors are not cloned. */
 | 
			
		||||
    This& operator=(const This& other);
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue