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

Made InitialState a proper class.

Browse Source
This commit is contained in:
Patrick Lühne
2016-05-22 13:58:05 +02:00
parent c7c7a93eba
commit beef3aca60
7 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/plasp/sas/AxiomRule.h
View File

@@ -3,6 +3,7 @@
#include <vector>
#include <plasp/sas/AssignedVariable.h>
#include <plasp/sas/Variable.h>
namespace plasp

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

@@ -2,14 +2,16 @@
#define __SAS__DESCRIPTION_H
#include <iosfwd>
#include <memory>
#include <vector>
#include <boost/filesystem/path.hpp>
#include <plasp/sas/AxiomRule.h>
#include <plasp/sas/InitialState.h>
#include <plasp/sas/MutexGroup.h>
#include <plasp/sas/Operator.h>
#include <plasp/sas/Variable.h>
#include <plasp/sas/AxiomRule.h>
namespace plasp
{
@@ -32,7 +34,7 @@ class Description
bool usesActionCosts() const;
const std::vector<Variable> &variables() const;
const std::vector<MutexGroup> &mutexGroups() const;
const std::vector<AssignedVariable> &initialStateFacts() const;
const InitialState &initialState() const;
const std::vector<AssignedVariable> &goalFacts() const;
const std::vector<Operator> &operators() const;
const std::vector<AxiomRule> &axiomRules() const;
@@ -55,7 +57,7 @@ class Description
std::vector<Variable> m_variables;
std::vector<MutexGroup> m_mutexGroups;
std::vector<AssignedVariable> m_initialStateFacts;
std::unique_ptr<InitialState> m_initialState;
std::vector<AssignedVariable> m_goalFacts;
std::vector<Operator> m_operators;
std::vector<AxiomRule> m_axiomRules;

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

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