Merge pull request #108 from sashafrey/master

Stability fixes for multi-class topic models
bigartm · Jan 21, 2015 · 59f141f · 59f141f
2 parents 499d391 + aa76dd1
commit 59f141f
Show file tree

Hide file tree

Showing 10 changed files with 246 additions and 145 deletions.
diff --git a/docs/ref/python_interface.txt b/docs/ref/python_interface.txt
@@ -162,7 +162,7 @@ MasterComponent
 
       Creates an instance of ItemsProcessedScore.
 
-   .. py:method:: CreateTopTokensScore(self, name = None, config = messages_pb2.TopTokensScoreConfig(), num_tokens = None)
+   .. py:method:: CreateTopTokensScore(self, name = None, config = messages_pb2.TopTokensScoreConfig(), num_tokens = None, class_id = None)
 
       Creates an instance of TopTokensScore.
 

diff --git a/src/artm/core/internals.pb.cc b/src/artm/core/internals.pb.cc
diff --git a/src/artm/core/internals.pb.h b/src/artm/core/internals.pb.h
diff --git a/src/artm/core/internals.proto b/src/artm/core/internals.proto
@@ -63,6 +63,7 @@ message ModelIncrement {
     IncrementValue = 1;    // Asks Merger to increment value of this token
     OverwriteValue = 2;    // Asks Merger to overwrite value of this token
     DeleteToken = 3;       // Asks Merger to remote this token
+    SkipToken = 4;         // Asks Merger to skip this token (used when class_id is not included in the model)
   }
 
   required string model_name = 1;

diff --git a/src/artm/core/internals.rpcz.cc b/src/artm/core/internals.rpcz.cc