[117035] trunk/dports/textproc/cicada
hum at macports.org
hum at macports.org
Thu Feb 13 07:55:54 PST 2014
Revision: 117035
https://trac.macports.org/changeset/117035
Author: hum at macports.org
Date: 2014-02-13 07:55:54 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
cicada: update to 0.3.2; delete sentence.hpp.
Modified Paths:
--------------
trunk/dports/textproc/cicada/Portfile
trunk/dports/textproc/cicada/files/patch-samples.diff
Removed Paths:
-------------
trunk/dports/textproc/cicada/files/sentence.hpp
Modified: trunk/dports/textproc/cicada/Portfile
===================================================================
--- trunk/dports/textproc/cicada/Portfile 2014-02-13 15:53:29 UTC (rev 117034)
+++ trunk/dports/textproc/cicada/Portfile 2014-02-13 15:55:54 UTC (rev 117035)
@@ -4,7 +4,7 @@
PortSystem 1.0
name cicada
-version 0.3.1
+version 0.3.2
categories textproc
maintainers hum openmaintainer
@@ -16,8 +16,8 @@
license LGPL-3+
master_sites ${homepage}
-checksums rmd160 26aa37cc9783bfe4a4f92f7005f07304a1c24dbb \
- sha256 58a68e108315ab4cb11c659fd38cb9edf761f5601eb04d4cdd9ab23149e0b6d3
+checksums rmd160 da2beb5cf756c71d93a9340d2827614a969aab8c \
+ sha256 235354448898c0d5ba341ad156606f8d82d958e5289dd6990017d6ff3b0cb27b
depends_lib port:expgram \
port:boost \
@@ -30,10 +30,6 @@
patchfiles patch-configure.diff \
patch-samples.diff
-post-extract {
- copy ${filespath}/sentence.hpp ${worksrcpath}/cicada/
-}
-
configure.optflags -O3
post-build {
Modified: trunk/dports/textproc/cicada/files/patch-samples.diff
===================================================================
--- trunk/dports/textproc/cicada/files/patch-samples.diff 2014-02-13 15:53:29 UTC (rev 117034)
+++ trunk/dports/textproc/cicada/files/patch-samples.diff 2014-02-13 15:55:54 UTC (rev 117035)
@@ -14,23 +14,6 @@
--f ../data/train.ja.bz2 \
--e ../data/train.en.bz2 \
--symmetric \
---- samples/kftt.30k/data/preprocess.sh.orig 2013-07-29 12:46:08.000000000 +0900
-+++ samples/kftt.30k/data/preprocess.sh 2013-10-27 18:22:09.000000000 +0900
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--cicada=../../..
-+bindir=@PREFIX@/bin
-
- ### Here, we will generate reference data suitable for cicada
- ### The format is simply:
-@@ -13,5 +13,5 @@
- ### so that multiple reference translations are merged into a single file.
-
- for data in tune dev; do
-- $cicada/progs/cicada_filter_refset $data.en --output $data.en.ref
-+ ${bindir}/cicada_filter_refset $data.en --output $data.en.ref
- done
--- samples/kftt.30k/ngram/expgram.sh.orig 2013-07-30 14:14:34.000000000 +0900
+++ samples/kftt.30k/ngram/expgram.sh 2013-10-27 18:23:31.000000000 +0900
@@ -1,17 +1,12 @@
Deleted: trunk/dports/textproc/cicada/files/sentence.hpp
===================================================================
--- trunk/dports/textproc/cicada/files/sentence.hpp 2014-02-13 15:53:29 UTC (rev 117034)
+++ trunk/dports/textproc/cicada/files/sentence.hpp 2014-02-13 15:55:54 UTC (rev 117035)
@@ -1,157 +0,0 @@
-// -*- mode: c++ -*-
-//
-// Copyright(C) 2010-2011 Taro Watanabe <taro.watanabe at nict.go.jp>
-//
-
-#ifndef __CICADA__SENTENCE__HPP__
-#define __CICADA__SENTENCE__HPP__ 1
-
-#include <iostream>
-#include <vector>
-#include <string>
-
-#include <cicada/symbol.hpp>
-
-#include <utils/hashmurmur3.hpp>
-#include <utils/piece.hpp>
-
-namespace cicada
-{
-
- class Sentence
- {
- public:
- typedef cicada::Symbol symbol_type;
- typedef cicada::Symbol word_type;
-
- private:
- typedef std::vector<word_type, std::allocator<word_type> > sent_type;
-
- public:
- typedef sent_type::size_type size_type;
- typedef sent_type::difference_type difference_type;
- typedef sent_type::value_type value_type;
-
- typedef sent_type::iterator iterator;
- typedef sent_type::const_iterator const_iterator;
- typedef sent_type::reverse_iterator reverse_iterator;
- typedef sent_type::const_reverse_iterator const_reverse_iterator;
- typedef sent_type::reference reference;
- typedef sent_type::const_reference const_reference;
-
- public:
- Sentence() : __sent() {}
- Sentence(size_type __n) : __sent(__n) {}
- Sentence(size_type __n, const word_type& __word) : __sent(__n, __word) {}
- template <typename Iterator>
- Sentence(Iterator first, Iterator last) : __sent(first, last) {}
- Sentence(const utils::piece& x) { assign(x); }
-
- void assign(size_type __n, const word_type& __word) { __sent.assign(__n, __word); }
- template <typename Iterator>
- void assign(Iterator first, Iterator last) { __sent.assign(first, last); }
- void assign(const utils::piece& x);
-
- bool assign(std::string::const_iterator& iter, std::string::const_iterator end);
- bool assign(utils::piece::const_iterator& iter, utils::piece::const_iterator end);
-
- // insert/erase...
- iterator insert(iterator pos, const word_type& word) { return __sent.insert(pos, word); }
- void insert(iterator pos, size_type n, const word_type& word) { __sent.insert(pos, n, word); }
- template <typename Iterator>
- void insert(iterator pos, Iterator first, Iterator last) { __sent.insert(pos, first, last); }
-
- iterator erase(iterator pos) { return __sent.erase(pos); }
- iterator erase(iterator first, iterator last) { return __sent.erase(first, last); }
-
- void push_back(const word_type& word) { __sent.push_back(word); }
- void pop_back() { __sent.pop_back(); }
-
- void swap(Sentence& __x) { __sent.swap(__x.__sent); }
-
- void clear() { __sent.clear(); }
- void reserve(size_type __n) { __sent.reserve(__n); }
- void resize(size_type __n) { __sent.resize(__n); }
- void resize(size_type __n, const word_type& __word) { __sent.resize(__n, __word); }
-
- size_type size() const { return __sent.size(); }
- bool empty() const { return __sent.empty(); }
-
- inline const_iterator begin() const { return __sent.begin(); }
- inline iterator begin() { return __sent.begin(); }
-
- inline const_iterator end() const { return __sent.end(); }
- inline iterator end() { return __sent.end(); }
-
- inline const_reverse_iterator rbegin() const { return __sent.rbegin(); }
- inline reverse_iterator rbegin() { return __sent.rbegin(); }
-
- inline const_reverse_iterator rend() const { return __sent.rend(); }
- inline reverse_iterator rend() { return __sent.rend(); }
-
- inline const_reference operator[](size_type pos) const { return __sent[pos]; }
- inline reference operator[](size_type pos) { return __sent[pos]; }
-
- inline const_reference front() const { return __sent.front(); }
- inline reference front() { return __sent.front(); }
-
- inline const_reference back() const { return __sent.back(); }
- inline reference back() { return __sent.back(); }
-
- public:
-
- friend
- size_t hash_value(Sentence const& x);
-
- friend
- std::ostream& operator<<(std::ostream& os, const Sentence& x);
- friend
- std::istream& operator>>(std::istream& is, Sentence& x);
-
- friend
- bool operator==(const Sentence& x, const Sentence& y);
- friend
- bool operator!=(const Sentence& x, const Sentence& y);
- friend
- bool operator<(const Sentence& x, const Sentence& y);
- friend
- bool operator>(const Sentence& x, const Sentence& y);
- friend
- bool operator<=(const Sentence& x, const Sentence& y);
- friend
- bool operator>=(const Sentence& x, const Sentence& y);
-
- private:
- sent_type __sent;
- };
-
- inline
- size_t hash_value(Sentence const& x) { return utils::hashmurmur3<size_t>()(x.__sent.begin(), x.__sent.end(), 0); }
-
- inline
- bool operator==(const Sentence& x, const Sentence& y) { return x.__sent == y.__sent; }
- inline
- bool operator!=(const Sentence& x, const Sentence& y) { return x.__sent != y.__sent; }
- inline
- bool operator<(const Sentence& x, const Sentence& y) { return x.__sent < y.__sent; }
- inline
- bool operator>(const Sentence& x, const Sentence& y) { return x.__sent > y.__sent; }
- inline
- bool operator<=(const Sentence& x, const Sentence& y) { return x.__sent <= y.__sent; }
- inline
- bool operator>=(const Sentence& x, const Sentence& y) { return x.__sent >= y.__sent; }
-
-
-
-};
-
-namespace std
-{
- inline
- void swap(cicada::Sentence& x, cicada::Sentence& y)
- {
- x.swap(y);
- }
-};
-
-#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140213/77d57a5b/attachment.html>
More information about the macports-changes
mailing list