Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
WCCL
Manage
Activity
Members
Labels
Plan
Issues
4
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Analysers
WCCL
Commits
1d8edb21
Commit
1d8edb21
authored
14 years ago
by
ilor
Browse files
Options
Downloads
Patches
Plain Diff
follow the switch to use shared_ptrs for sentence and chunk objects in corpus2
parent
075930df
Branches
Branches containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libwccl/sentencecontext.cpp
+1
-1
1 addition, 1 deletion
libwccl/sentencecontext.cpp
tests/datadriven.cpp
+1
-1
1 addition, 1 deletion
tests/datadriven.cpp
wcclparser/main.cpp
+3
-2
3 additions, 2 deletions
wcclparser/main.cpp
with
5 additions
and
4 deletions
libwccl/sentencecontext.cpp
+
1
−
1
View file @
1d8edb21
...
...
@@ -10,7 +10,7 @@ SentenceContext::SentenceContext(const boost::shared_ptr<Corpus2::Sentence>& s)
SentenceContext
SentenceContext
::
duplicate
()
const
{
SentenceContext
dup
(
*
this
);
dup
.
sentence_
.
reset
(
sentence_
->
clone
(
)
);
dup
.
sentence_
=
sentence_
->
clone
_shared
();
return
dup
;
}
...
...
This diff is collapsed.
Click to expand it.
tests/datadriven.cpp
+
1
−
1
View file @
1d8edb21
...
...
@@ -66,7 +66,7 @@ void test_one_item_actual(const compare_test& c)
if
(
!
sentence_filename
.
empty
())
{
path
sentence_fullpath
=
c
.
search_path
/
sentence_filename
;
Corpus2
::
XcesReader
reader
(
tagset
,
sentence_fullpath
.
string
());
sentence
.
reset
(
reader
.
get_next_sentence
()
)
;
sentence
=
reader
.
get_next_sentence
();
BOOST_REQUIRE
(
sentence
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
wcclparser/main.cpp
+
3
−
2
View file @
1d8edb21
...
...
@@ -8,6 +8,7 @@
#include
<libcorpus2/tagsetmanager.h>
#include
<boost/bind.hpp>
#include
<boost/make_shared.hpp>
#include
<boost/program_options.hpp>
#include
<libcorpus2/io/xcesreader.h>
...
...
@@ -209,13 +210,13 @@ int main(int argc, char** argv)
const
Corpus2
::
Tagset
&
tagset
=
Corpus2
::
get_named_tagset
(
tagset_load
);
boost
::
shared_ptr
<
Corpus2
::
Sentence
>
sentence
;
if
(
sentence_load
.
empty
())
{
sentence
.
reset
(
new
Corpus2
::
Sentence
);
sentence
=
boost
::
make_shared
<
Corpus2
::
Sentence
>
(
);
sentence
->
append
(
new
Corpus2
::
Token
(
""
,
PwrNlp
::
Whitespace
::
ManySpaces
));
}
else
{
std
::
ifstream
ifs
(
sentence_load
.
c_str
());
if
(
ifs
.
good
())
{
Corpus2
::
XcesReader
reader
(
tagset
,
ifs
,
false
);
sentence
.
reset
(
reader
.
get_next_sentence
()
)
;
sentence
=
reader
.
get_next_sentence
();
std
::
cerr
<<
"Sentence loaded, "
<<
sentence
->
size
()
<<
" tokens.
\n
"
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment