patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Made Goal a proper class.

Browse Source
This commit is contained in:
Patrick Lühne
2016-05-22 14:04:58 +02:00
parent beef3aca60
commit 90dfa302a9
6 changed files with 105 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/plasp/sas/Description.h
View File

@@ -8,6 +8,7 @@
#include <boost/filesystem/path.hpp>
#include <plasp/sas/AxiomRule.h>
#include <plasp/sas/Goal.h>
#include <plasp/sas/InitialState.h>
#include <plasp/sas/MutexGroup.h>
#include <plasp/sas/Operator.h>
@@ -35,7 +36,7 @@ class Description
const std::vector<Variable> &variables() const;
const std::vector<MutexGroup> &mutexGroups() const;
const InitialState &initialState() const;
const std::vector<AssignedVariable> &goalFacts() const;
const Goal &goal() const;
const std::vector<Operator> &operators() const;
const std::vector<AxiomRule> &axiomRules() const;
@@ -58,7 +59,7 @@ class Description
std::vector<Variable> m_variables;
std::vector<MutexGroup> m_mutexGroups;
std::unique_ptr<InitialState> m_initialState;
std::vector<AssignedVariable> m_goalFacts;
std::unique_ptr<Goal> m_goal;
std::vector<Operator> m_operators;
std::vector<AxiomRule> m_axiomRules;
};

39
include/plasp/sas/Goal.h Normal file
View File

@@ -0,0 +1,39 @@
#ifndef __SAS__GOAL_H
#define __SAS__GOAL_H
#include <plasp/sas/AssignedVariable.h>
namespace plasp
{
namespace sas
{
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Goal
//
////////////////////////////////////////////////////////////////////////////////////////////////////
class Goal
{
public:
using Fact = AssignedVariable;
using Facts = std::vector<Fact>;
static Goal fromSAS(std::istream &istream, const std::vector<Variable> &variables);
public:
const Facts &facts() const;
private:
Goal() = default;
Facts m_facts;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
}
}
#endif