Removed interfaces deprecated in 0.2.6

diff --git a/ChangeLog b/ChangeLog
index 1e24851..89e978d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 git master
 ----------
 
+* Removed interfaces deprecated in 0.2.6.
 * Fixed a bug in JTree::findMaximum() (reported by zhengyun84 and Dhruv Batra):
   if one or more variables had a MAP belief with more than one maximum, an 
   incorrect MAP state could result.

diff --git a/include/dai/bipgraph.h b/include/dai/bipgraph.h
index 999e5d3..4683df9 100644 (file)
--- a/include/dai/bipgraph.h
+++ b/include/dai/bipgraph.h
@@ -46,21 +46,6 @@ namespace dai {
  *  \idea Cache second-order neighborhoods in BipartiteGraph.
  */
 class BipartiteGraph {
-        /// Describes the neighbor relationship of two nodes in a BipartiteGraph.
-        /** \deprecated Please use dai::Neighbor instead
-         */
-        typedef dai::Neighbor Neighbor;
-
-        /// Describes the neighbors of some node.
-        /** \deprecated Please use dai::Neighbors instead
-         */
-        typedef dai::Neighbors Neighbors;
-
-        /// Represents an edge: an Edge(\a n1,\a n2) corresponds to the edge between node \a n1 of type 1 and node \a n2 of type 2.
-        /** \deprecated Please use dai::Edge instead
-         */
-        typedef dai::Edge Edge;
-
     private:
         /// Contains for each node of type 1 a vector of its neighbors
         std::vector<Neighbors> _nb1;

diff --git a/include/dai/dag.h b/include/dai/dag.h
index 4822e72..746c59d 100644 (file)
--- a/include/dai/dag.h
+++ b/include/dai/dag.h
@@ -41,21 +41,6 @@ namespace dai {
  *  parent and children nodes.
  */
 class DAG {
-        /// Describes the parent/child relationship of two nodes in a DAG.
-        /** \deprecated Please use dai::Neighbor instead
-         */
-        typedef dai::Neighbor Neighbor;
-
-        /// Type for storing the parents/children of some node.
-        /** \deprecated Please use dai::Neighbors instead
-         */
-        typedef dai::Neighbors Neighbors;
-
-        /// Represents a directed edge: an Edge(\a n1,\a n2) corresponds to the edge from node \a n1 to node \a n2.
-        /** \deprecated Please use dai::Edge instead
-         */
-        typedef dai::Edge Edge;
-
     private:
         /// Contains for each node a vector of its parent nodes
         std::vector<Neighbors> _pa;

diff --git a/include/dai/gibbs.h b/include/dai/gibbs.h
index fb0a5b7..7f763f8 100644 (file)
--- a/include/dai/gibbs.h
+++ b/include/dai/gibbs.h
@@ -133,10 +133,10 @@ class Gibbs : public DAIAlgFG {
 };
 
 
-/// Runs Gibbs sampling for \a iters iterations (of which \a burnin for burn-in) on FactorGraph \a fg, and returns the resulting state
+/// Runs Gibbs sampling for \a maxiter iterations (of which \a burnin for burn-in) on FactorGraph \a fg, and returns the resulting state
 /** \relates Gibbs
  */
-std::vector<size_t> getGibbsState( const FactorGraph &fg, size_t iters );
+std::vector<size_t> getGibbsState( const FactorGraph &fg, size_t maxiter );
 
 
 } // end of namespace dai

diff --git a/include/dai/graph.h b/include/dai/graph.h
index e9506af..6eeeb96 100644 (file)
--- a/include/dai/graph.h
+++ b/include/dai/graph.h
@@ -115,22 +115,6 @@ typedef std::pair<size_t,size_t> Edge;
  *  neighboring nodes.
  */
 class GraphAL {
-    public:
-        /// Describes the neighbor relationship of two nodes in a GraphAL.
-        /** \deprecated Please use dai::Neighbor instead
-         */
-        typedef dai::Neighbor Neighbor;
-
-        /// Describes the neighbors of some node.
-        /** \deprecated Please use dai::Neighbors instead
-         */
-        typedef dai::Neighbors Neighbors;
-
-        /// Represents an edge: an Edge(\a n1,\a n2) corresponds to the edge between node \a n1 and node \a n2.
-        /** \deprecated Please use dai::Edge instead
-         */
-        typedef dai::Edge Edge;
-
     private:
         /// Contains for each node a vector of its neighbors
         std::vector<Neighbors> _nb;

diff --git a/include/dai/util.h b/include/dai/util.h
index b1378be..e354961 100644 (file)
--- a/include/dai/util.h
+++ b/include/dai/util.h
@@ -217,12 +217,6 @@ std::vector<T> concat( const std::vector<T>& u, const std::vector<T>& v ) {
 std::vector<std::string> tokenizeString( const std::string& s, bool singleDelim, const std::string& delim="\t\n" );
 
 
-/// Split a string into tokens delimited by one of the characters in \a delim
-/** \deprecated Please use dai::tokenizeString( const std::string&, bool, const std::string& ) instead
- */
-void tokenizeString( const std::string& s, std::vector<std::string>& outTokens, const std::string& delim="\t\n" );
-
-
 /// Enumerates different ways of normalizing a probability measure.
 /**
  *  - NORMPROB means that the sum of all entries should be 1;

diff --git a/src/gibbs.cpp b/src/gibbs.cpp
index a07ee03..0ce37d2 100644 (file)
--- a/src/gibbs.cpp
+++ b/src/gibbs.cpp
@@ -29,12 +29,8 @@ const char *Gibbs::Name = "GIBBS";
 
 
 void Gibbs::setProperties( const PropertySet &opts ) {
-    /// \deprecated The 'iters' property has been renamed into 'maxiters'
-    DAI_ASSERT( opts.hasKey("maxiter") || opts.hasKey("iters") );
-    if( opts.hasKey("maxiter") )
-        props.maxiter = opts.getStringAs<size_t>("maxiter");
-    else
-        props.maxiter = opts.getStringAs<size_t>("iters");
+    DAI_ASSERT( opts.hasKey("maxiter") );
+    props.maxiter = opts.getStringAs<size_t>("maxiter");
 
     if( opts.hasKey("restart") )
         props.restart = opts.getStringAs<size_t>("restart");
@@ -269,9 +265,9 @@ Factor Gibbs::belief( const VarSet &ns ) const {
 }
 
 
-std::vector<size_t> getGibbsState( const FactorGraph &fg, size_t iters ) {
+std::vector<size_t> getGibbsState( const FactorGraph &fg, size_t maxiter ) {
     PropertySet gibbsProps;
-    gibbsProps.set( "maxiter", iters );
+    gibbsProps.set( "maxiter", maxiter );
     gibbsProps.set( "burnin", size_t(0) );
     gibbsProps.set( "verbose", size_t(0) );
     Gibbs gibbs( fg, gibbsProps );

diff --git a/src/util.cpp b/src/util.cpp
index f4b7adb..52e2215 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -127,16 +127,4 @@ std::vector<std::string> tokenizeString( const std::string& s, bool singleDelim,
 }
 
 
-void tokenizeString(const std::string& s, std::vector<std::string>& outTokens, const std::string& delim) {
-    size_t start = 0;
-    while (start < s.size()) {
-        size_t end = s.find_first_of(delim, start);
-        if (end > s.size())
-            end = s.size();
-        outTokens.push_back(s.substr(start, end - start));
-        start = end + 1;
-    }
-}
-
-
 } // end of namespace dai