diff options
| author | David Robillard <d@drobilla.net> | 2007-05-01 04:01:04 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-05-01 04:01:04 +0000 |
| commit | cfce5f86e3ce1572299bd62e7047e0cb985a4358 (patch) | |
| tree | cb0768b308a20af399acecd7e6c12965fe1279ad /src/engine/Machine.cpp | |
| parent | f11d9299afca21e52e0093784bed0b5ef8a506d0 (diff) | |
| download | machina-cfce5f86e3ce1572299bd62e7047e0cb985a4358.tar.gz machina-cfce5f86e3ce1572299bd62e7047e0cb985a4358.tar.bz2 machina-cfce5f86e3ce1572299bd62e7047e0cb985a4358.zip | |
Converted Raul (and thus Ingen and Machina) to use Redland over Raptor/Rasqal independently.
Fixed patch loading for Ingen (local only, still something wrong with remote...).
git-svn-id: http://svn.drobilla.net/lad/machina@486 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/Machine.cpp')
| -rw-r--r-- | src/engine/Machine.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp index d4a3425..815ba5b 100644 --- a/src/engine/Machine.cpp +++ b/src/engine/Machine.cpp @@ -16,7 +16,9 @@ */ #include <cstdlib> -#include "raul/SharedPtr.h" +#include <raul/RDFWorld.h> +#include <raul/RDFModel.h> +#include <raul/SharedPtr.h> #include "machina/Machine.hpp" #include "machina/Node.hpp" #include "machina/Edge.hpp" @@ -292,29 +294,29 @@ Machine::learn(SharedPtr<LearnRequest> learn) void -Machine::write_state(Raul::RDFWriter& writer) +Machine::write_state(Raul::RDF::Model& model) { - using Raul::RdfId; + using namespace Raul; - writer.add_prefix("machina", "http://drobilla.net/ns/machina#"); + model.world().add_prefix("machina", "http://drobilla.net/ns/machina#"); - writer.write(RdfId(RdfId::RESOURCE, ""), - RdfId(RdfId::RESOURCE, "rdf:type"), - RdfId(RdfId::RESOURCE, "machina:Machine")); + model.add_statement(RDF::Node(model.world(), RDF::Node::RESOURCE, ""), + RDF::Node(model.world(), RDF::Node::RESOURCE, "rdf:type"), + RDF::Node(model.world(), RDF::Node::RESOURCE, "machina:Machine")); size_t count = 0; for (Nodes::const_iterator n = _nodes.begin(); n != _nodes.end(); ++n) { - (*n)->write_state(writer); + (*n)->write_state(model); if ((*n)->is_initial()) { - writer.write(RdfId(RdfId::RESOURCE, ""), - RdfId(RdfId::RESOURCE, "machina:initialNode"), + model.add_statement(RDF::Node(model.world(), RDF::Node::RESOURCE, ""), + RDF::Node(model.world(), RDF::Node::RESOURCE, "machina:initialNode"), (*n)->id()); } else { - writer.write(RdfId(RdfId::RESOURCE, ""), - RdfId(RdfId::RESOURCE, "machina:node"), + model.add_statement(RDF::Node(model.world(), RDF::Node::RESOURCE, ""), + RDF::Node(model.world(), RDF::Node::RESOURCE, "machina:node"), (*n)->id()); } } @@ -326,10 +328,10 @@ Machine::write_state(Raul::RDFWriter& writer) for (Node::Edges::const_iterator e = (*n)->outgoing_edges().begin(); e != (*n)->outgoing_edges().end(); ++e) { - (*e)->write_state(writer); + (*e)->write_state(model); - writer.write(RdfId(RdfId::RESOURCE, ""), - RdfId(RdfId::RESOURCE, "machina:edge"), + model.add_statement(RDF::Node(model.world(), RDF::Node::RESOURCE, ""), + RDF::Node(model.world(), RDF::Node::RESOURCE, "machina:edge"), (*e)->id()); } |