Merge pull request HIT-SCIR#274 from HIT-SCIR/develop

Develop
UniKrau · Dec 20, 2017 · f414a9b · f414a9b
2 parents 5ed1662 + 3507750
commit f414a9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/console/srl_cmdline.cpp b/src/console/srl_cmdline.cpp
@@ -67,7 +67,7 @@ void multithreaded_srl(void *args) {
     for (int k = 0; k < vecSRLResult.size(); ++k) {
       is_pred[vecSRLResult[k].first] = true;
       for (int j = 0; j < vecSRLResult[k].second.size(); ++j) {
-        arg[findRoot(parse, vecSRLResult[k].second[j].second)][k] = vecSRLResult[k].second[k].first;
+        arg[findRoot(parse, vecSRLResult[k].second[j].second)][k] = vecSRLResult[k].second[j].first;
       }
     }
 

diff --git a/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h
@@ -31,12 +31,12 @@ namespace Eigen {
   *
   * \sa Tensor
   */
-template<typename T, typename Dimensions, int Options_> class TensorStorage;
+template<typename T, typename Dimensions, int Options> class TensorStorage;
 
 
 // Pure fixed-size storage
-template<typename T, int Options_, typename FixedDimensions>
-class TensorStorage<T, FixedDimensions, Options_>
+template<typename T, typename FixedDimensions, int Options_>
+class TensorStorage
 {
  private:
   static const std::size_t Size = FixedDimensions::total_size;
@@ -66,7 +66,7 @@ class TensorStorage<T, FixedDimensions, Options_>
 
 
 // pure dynamic
-template<typename T, int Options_, typename IndexType, int NumIndices_>
+template<typename T, typename IndexType, int NumIndices_, int Options_>
 class TensorStorage<T, DSizes<IndexType, NumIndices_>, Options_>
 {
   public: