Swig code clean up

swig/annotatedsentence.i

@@ -17,9 +17,8 @@
 
 %feature("notabstract") Corpus2::AnnotatedSentence;
 
-%template(chan_map_t) std::map<std::string, Corpus2::AnnotationChannel>;
-%template(SentencePtr) boost::shared_ptr<Corpus2::Sentence>;
 %template(AnnotatedSentencePtr) boost::shared_ptr<Corpus2::AnnotatedSentence>;
+%template(ConstAnnotatedSentencePtr) boost::shared_ptr<const Corpus2::AnnotatedSentence>;
 
 namespace Corpus2 {
   class MissingAnnotationChannel : public Corpus2Error {

swig/annotationchannel.i

@@ -8,14 +8,21 @@
 
 %include "std_string.i"
 %include "std_vector.i"
+%include "boost_shared_ptr.i"
 
 %include "iob.i"
 %include "std_defs.i"
 
-// %template(IntVector) std::vector<int>;
-%template(IOBVector) std::vector<Corpus2::IOB::Enum>;
+%template(chan_map_t) std::map<std::string, Corpus2::AnnotationChannel>;
+
+%template(AnnotationoPtr) boost::shared_ptr<Corpus2::Annotation>;
+%template(ConstAnnotationoPtr) boost::shared_ptr<const Corpus2::Annotation>;
+
 %template(AnnotationVector) std::vector<Corpus2::Annotation>;
 
+%template(AnnotationChannelPtr) boost::shared_ptr<Corpus2::AnnotationChannel>;
+%template(ConstAnnotationChannelPtr) boost::shared_ptr<const Corpus2::AnnotationChannel>;
+
 namespace Corpus2 {
   struct Annotation {
     Annotation() : indices(), head_index(-1), seg_number(0) {}

swig/annotationview.i

@@ -14,6 +14,7 @@
 %include "boost_shared_ptr.i"
 
 %template(AnnotationViewPtr) boost::shared_ptr<Corpus2::AnnotationView>;
+%template(ConstAnnotationViewPtr) boost::shared_ptr<const Corpus2::AnnotationView>;
 
 %nodefaultctor Corpus2::TokenWriter;
 
@@ -24,7 +25,7 @@ namespace Corpus2 {
     ~AnnotationView();
 
     /* --------------------------------------------------------------------- */
-    Ptr clone_shared() const;
+    boost::shared_ptr<Sentence> clone_shared() const;
     
     /* --------------------------------------------------------------------- */
     void commit();

swig/chunk.i

@@ -8,7 +8,6 @@
 
 
 %include "std_defs.i"
-
 %include "std_set.i"
 %include "std_map.i"
 %include "std_pair.i"
@@ -22,9 +21,6 @@
 %template(ConstChunkPtr) boost::shared_ptr<const Corpus2::Chunk>;
 %template(ChunkPtrVector) std::vector< boost::shared_ptr<Corpus2::Chunk> >;
 
-%template(SentencePtrVector) std::vector<boost::shared_ptr<Sentence> >;
-// %template(attr_map_t) std::map<std::string, std::string>;
-
 namespace Corpus2 {
   class Chunk {
   public:

swig/iob.i

@@ -6,7 +6,7 @@
   #include <libcorpus2/ann/iob.h>
 %}
 
-// %include "...i"
+%template(IOBVector) std::vector<Corpus2::IOB::Enum>;
 
 namespace Corpus2 {
   namespace IOB {

swig/lexeme.i

@@ -18,7 +18,7 @@
 %rename(__op_eq__) Corpus2::Lexeme::operator==(const Lexeme& other) const;
 %rename(__op_lw__) Corpus2::Lexeme::operator<(const Lexeme& other) const;
 
-/* %template(TagPtr) boost::shared_ptr<Corpus2::Tag>; */
+%template(LexemeVector) std::vector<Corpus2::Lexeme>;
 
 namespace Corpus2 {
   class Lexeme {

swig/relation.i

@@ -10,7 +10,6 @@
 %include "std_string.i"
 %include "boost_shared_ptr.i"
 
-// %feature("notabstract") Corpus2::TokenMetaData;
 %template(DirectionPointPtr) boost::shared_ptr<Corpus2::DirectionPoint>;
 %template(ConstDirectionPointPtr) boost::shared_ptr<const Corpus2::DirectionPoint>;
 

swig/sentence.i

@@ -10,9 +10,11 @@
 %include "token.i"
 %include "boost_shared_ptr.i"
 
-%template(Ptr) boost::shared_ptr<Corpus2::Sentence>;
-%template(ConstPtr) boost::shared_ptr<const Corpus2::Sentence>;
-%template(TokenPtrVector) std::vector<Corpus2::Token*>;
+%template(SentencePtr) boost::shared_ptr<Corpus2::Sentence>;
+%template(ConstSentencePtr) boost::shared_ptr<const Corpus2::Sentence>;
+
+%template(SentencePtrVector) std::vector<boost::shared_ptr<Corpus2::Sentence> >;
+%template(ConstSentencePtrVector) std::vector<boost::shared_ptr<const Corpus2::Sentence> >;
 
 namespace Corpus2 {
   class Sentence {

swig/tag.i

@@ -20,6 +20,8 @@
 %rename(__op_eq__) Corpus2::Tag::operator==(const Tag& other) const;
 %rename(__op_lw__) Corpus2::Tag::operator<(const Tag& other) const;
 
+%template(TagVector) std::vector<Corpus2::Tag>;
+
 namespace Corpus2 {
   class Tag {
   public:

swig/tagset.i

@@ -15,8 +15,8 @@
 
 %feature("notabstract") Corpus2::Tagset;
 
-%template(TagVector) std::vector<Corpus2::Tag>;
-// %template(StdStringVector) std::vector<std::string>;
+%template(TagsetPtr) boost::shared_ptr<Corpus2::Tagset>;
+%template(ConstTagsetPtr) boost::shared_ptr<const Corpus2::Tagset>;
 
 namespace Corpus2 {
   class Tagset;

swig/tagsetmanager.i

@@ -14,7 +14,6 @@
 %include "boost_shared_ptr.i"
 
 %feature("notabstract") Corpus2::TagsetManager;
-%template(TagsetPtr) boost::shared_ptr<Tagset>;
 
 namespace Corpus2 {
   class TagsetNotFound : public Corpus2Error {

swig/token.i

@@ -20,7 +20,11 @@
 
 %rename(__op_eq__) Corpus2::Token::operator==(const Corpus2::Token& other) const;
 
-%template(LexemeVector) std::vector<Corpus2::Lexeme>;
+%template(TokenPtr) boost::shared_ptr<Corpus2::Token>;
+%template(ConstTokenPtr) boost::shared_ptr<const Corpus2::Token>;
+
+%template(TokenPtrVector) std::vector<Corpus2::Token*>;
+%template(ConstTokenPtrVector) std::vector<const Corpus2::Token*>;
 
 namespace Corpus2 {
   class Token {

swig/tokenmetadata.i

@@ -15,6 +15,7 @@
 %feature("notabstract") Corpus2::TokenMetaData;
 
 %template(TokenMetaDataPtr) boost::shared_ptr<Corpus2::TokenMetaData>;
+%template(ConstTokenMetaDataPtr) boost::shared_ptr<const Corpus2::TokenMetaData>;
 
 namespace Corpus2 {
   class TokenMetaData {

swig/tokenreader.i

@@ -17,11 +17,12 @@
 %include "boost_shared_ptr.i"
 
 %nodefaultctor Corpus2::TokenReader;
+
 %template(TokenReaderPtr) boost::shared_ptr<Corpus2::TokenReader>;
-%template(TokenPtr) boost::shared_ptr<Corpus2::Token>;
-// %template(StdStringVector) std::vector<std::string>;
-// %template(ChunkPtr) boost::shared_ptr<Corpus2::Chunk>;
-typedef boost::shared_ptr<Corpus2::Token> TokenPtr;
+%template(ConstTokenReaderPtr) boost::shared_ptr<const Corpus2::TokenReader>;
+
+// typedef boost::shared_ptr<Corpus2::Token> TokenPtr;
+
 namespace Corpus2 {
   class TokenReader {
   public:

swig/tokenwriter.i

@@ -15,7 +15,9 @@
 %include "boost_shared_ptr.i"
 
 %nodefaultctor Corpus2::TokenWriter;
+
 %template(TokenWriterPtr) boost::shared_ptr<Corpus2::TokenWriter>;
+%template(ConstTokenWriterPtr) boost::shared_ptr<const Corpus2::TokenWriter>;
 
 namespace Corpus2 {
   class TokenWriter {

swig/unicodestring.i

@@ -17,11 +17,11 @@ class UnicodeString {
     UChar* getTerminatedBuffer();
 
 %pythoncode %{
-	def __unicode__(self):
-		return self.as_utf16().decode('utf16')
+  def __unicode__(self):
+    return self.as_utf16().decode('utf16')
 
-	def __str__(self):
-		return self.as_utf8()
+  def __str__(self):
+    return self.as_utf8()
 %}
 
 };
@@ -31,11 +31,11 @@ class UnicodeString {
         return std::string((char*)self->getTerminatedBuffer(), self->length()*2);
     }
 
-	std::string as_utf8() {
-		std::string r;
-		self->toUTF8String(r);
-		return r;
-	}
+  std::string as_utf8() {
+    std::string r;
+    self->toUTF8String(r);
+    return r;
+  }
 }