Skip to content

Commit

Permalink
GIA 2p4a - rename all c++ .h files to .hpp
Browse files Browse the repository at this point in the history
  • Loading branch information
bairesearch committed Jan 17, 2017
1 parent dea64bb commit d030771
Show file tree
Hide file tree
Showing 69 changed files with 399 additions and 399 deletions.
4 changes: 2 additions & 2 deletions GIA/GIAbot.cpp
Expand Up @@ -26,14 +26,14 @@
* File Name: GIAbot.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Converts relation objects into GIA nodes (of type entity, action, condition etc) in GIA network/tree
*
*******************************************************************************/


#include "GIAbot.h"
#include "GIAbot.hpp"

#ifdef GIA_BOT_SWITCH_FIRST_AND_SECOND_PERSON
void GIAbotClass::botSwitchFirstAndSecondPerson(GIAsentence* currentSentenceInList, const bool GIAentityNodeArrayFilled[], GIAentityNode* GIAentityNodeArray[])
Expand Down
14 changes: 7 additions & 7 deletions GIA/GIAbot.h → GIA/GIAbot.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAbot.h
* File Name: GIAbot.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Converts relation objects into GIA network nodes (of type entity, action, condition etc) in GIA network/tree
*
Expand All @@ -37,11 +37,11 @@
#define HEADER_GIA_BOT


#include "GIAglobalDefs.h"
#include "GIAsentenceClass.h"
#include "GIAentityNodeClass.h"
#include "GIAentityConnectionClass.h"
#include "GIAconditionNodeClass.h"
#include "GIAglobalDefs.hpp"
#include "GIAsentenceClass.hpp"
#include "GIAentityNodeClass.hpp"
#include "GIAentityConnectionClass.hpp"
#include "GIAconditionNodeClass.hpp"

#define FEATURE_FIRST_PERSON_NUMBER_OF_TYPES (5)
#define FEATURE_SECOND_PERSON_NUMBER_OF_TYPES (5)
Expand Down
4 changes: 2 additions & 2 deletions GIA/GIAconditionNodeClass.cpp
Expand Up @@ -26,12 +26,12 @@
* File Name: GIAconditionNodeClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
*
*******************************************************************************/


#include "GIAconditionNodeClass.h"
#include "GIAconditionNodeClass.hpp"

//~? [eg past, wednesday, etc]
GIAtimeConditionNode::GIAtimeConditionNode(void)
Expand Down
8 changes: 4 additions & 4 deletions GIA/GIAconditionNodeClass.h → GIA/GIAconditionNodeClass.hpp
Expand Up @@ -23,19 +23,19 @@

/*******************************************************************************
*
* File Name: GIAconditionNodeClass.h
* File Name: GIAconditionNodeClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
*
*******************************************************************************/


#ifndef HEADER_GIA_CONDITION_NODE_CLASS
#define HEADER_GIA_CONDITION_NODE_CLASS

#include "GIAglobalDefs.h"
#include "SHAREDvars.h"
#include "GIAglobalDefs.hpp"
#include "SHAREDvars.hpp"


//class GIAtimeConditionNode;
Expand Down
4 changes: 2 additions & 2 deletions GIA/GIAcxlConversion.cpp
Expand Up @@ -26,14 +26,14 @@
* File Name: GIAcxlConversion.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Description: Converts GIA network nodes into an XML, or converts an XML file into GIA network nodes
* NB this function creates entity idActiveListReorderdIDforXMLsave values upon write to speed up linking process (does not use original idActiveList values)
*
*******************************************************************************/


#include "GIAcxlConversion.h"
#include "GIAcxlConversion.hpp"

bool GIAcxlConversionClass::writeCmapToolsCXLFileOptimised(const string xmlFileName, vector<GIAentityNode*>* entityNodesActiveListComplete, unordered_map<string, GIAentityNode*>* networkIndexEntityNodesListMap)
{
Expand Down
12 changes: 6 additions & 6 deletions GIA/GIAcxlConversion.h → GIA/GIAcxlConversion.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAcxlConversion.h
* File Name: GIAcxlConversion.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Description: Converts GIA network nodes into an XML, or converts an XML file into GIA network nodes
*
*******************************************************************************/
Expand All @@ -36,10 +36,10 @@
#define HEADER_GIA_CXL_CONVERSION


#include "XMLparserClass.h"
#include "GIAentityNodeClass.h"
#include "GIAentityConnectionClass.h"
#include "GIAconditionNodeClass.h"
#include "XMLparserClass.hpp"
#include "GIAentityNodeClass.hpp"
#include "GIAentityConnectionClass.hpp"
#include "GIAconditionNodeClass.hpp"

#ifdef GIA_CMAP_CONVERSION_SANITISED
#define GIA_CMAP_CONVERSION_SANITISED_DO_NOT_ADD_REDUNDANT_NETWORK_INDEX_NODES
Expand Down
6 changes: 3 additions & 3 deletions GIA/GIAdatabase.cpp
Expand Up @@ -23,17 +23,17 @@

/*******************************************************************************
*
* File Name: GIAdatabase.h
* File Name: GIAdatabase.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires a GIA network created for both existing knowledge and the query (question)
* Description: performs simple GIA database functions (storing nodes in ordered arrays/vectors/maps)
*
*******************************************************************************/


#include "GIAdatabase.h"
#include "GIAdatabase.hpp"

#define CHAR_NEWLINE '\n'

Expand Down
14 changes: 7 additions & 7 deletions GIA/GIAdatabase.h → GIA/GIAdatabase.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAdatabase.h
* File Name: GIAdatabase.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires a GIA network created for both existing knowledge and the query (question)
* Description: performs simple GIA database functions (storing nodes in ordered arrays/vectors/maps)
*
Expand All @@ -36,11 +36,11 @@
#ifndef HEADER_GIA_DATABASE
#define HEADER_GIA_DATABASE

#include "GIAentityNodeClass.h"
#include "GIAentityConnectionClass.h"
#include "GIAconditionNodeClass.h"
#include "GIAglobalDefs.h"
#include "SHAREDvars.h" //file io
#include "GIAentityNodeClass.hpp"
#include "GIAentityConnectionClass.hpp"
#include "GIAconditionNodeClass.hpp"
#include "GIAglobalDefs.hpp"
#include "SHAREDvars.hpp" //file io


#define GIA_DATABASE_NODE_NETWORK_INDEX_ID_INSTANCE (GIA_ENTITY_ID_INSTANCE_NETWORK_INDEX_ENTITY)
Expand Down
6 changes: 3 additions & 3 deletions GIA/GIAdraw.cpp
Expand Up @@ -23,17 +23,17 @@

/*******************************************************************************
*
* File Name: GIAdraw.h
* File Name: GIAdraw.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Draws GIA nodes in GIA network/tree
*
*******************************************************************************/


#include "GIAdraw.h"
#include "GIAdraw.hpp"


#include <GL/freeglut.h> //need to use freeglut as it contains extensions functions which glut does not have; glutMainLoopEvent()
Expand Down
30 changes: 15 additions & 15 deletions GIA/GIAdraw.h → GIA/GIAdraw.hpp
Expand Up @@ -26,7 +26,7 @@
* File Name: GIAdraw.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: Draws GIA nodes in GIA network/tree
*
Expand All @@ -36,20 +36,20 @@
#ifndef HEADER_GIA_DRAW
#define HEADER_GIA_DRAW

#include "LDreferenceClass.h"
#include "XMLparserClass.h"
#include "GIAglobalDefs.h"
#include "GIAentityNodeClass.h"
#include "GIAentityConnectionClass.h"
#include "GIAconditionNodeClass.h"
#include "XMLrulesClass.h"
#include "LDsvg.h"
#include "LDopengl.h"
#include "XMLrulesClass.h"
#include "LDparser.h"
#include "LDsprite.h"
#include "LDreferenceManipulation.h"
#include "RTpixelMaps.h"
#include "LDreferenceClass.hpp"
#include "XMLparserClass.hpp"
#include "GIAglobalDefs.hpp"
#include "GIAentityNodeClass.hpp"
#include "GIAentityConnectionClass.hpp"
#include "GIAconditionNodeClass.hpp"
#include "XMLrulesClass.hpp"
#include "LDsvg.hpp"
#include "LDopengl.hpp"
#include "XMLrulesClass.hpp"
#include "LDparser.hpp"
#include "LDsprite.hpp"
#include "LDreferenceManipulation.hpp"
#include "RTpixelMaps.hpp"



Expand Down
4 changes: 2 additions & 2 deletions GIA/GIAentityConnectionClass.cpp
Expand Up @@ -26,12 +26,12 @@
* File Name: GIAentityConnectionClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
*
*******************************************************************************/


#include "GIAentityConnectionClass.h"
#include "GIAentityConnectionClass.hpp"


GIAentityConnection::GIAentityConnection(void)
Expand Down
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAentityConnectionClass.h
* File Name: GIAentityConnectionClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* NB a substance is an instance of an entity, any given entity may contain/comprise/have multiple substances - and substances are unrelated to definitions between entities [they just define what comprises any given entity]
*
*******************************************************************************/
Expand All @@ -37,7 +37,7 @@



#include "GIAglobalDefs.h"
#include "GIAglobalDefs.hpp"


#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions GIA/GIAentityNodeClass.cpp
Expand Up @@ -26,12 +26,12 @@
* File Name: GIAentityNodeClass.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
*
*******************************************************************************/


#include "GIAentityNodeClass.h"
#include "GIAentityNodeClass.hpp"


string quantityNumberLowNameArray[QUANTITY_NUMBER_LOW_NUMBER_OF_TYPES] = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "nineteen"};
Expand Down
10 changes: 5 additions & 5 deletions GIA/GIAentityNodeClass.h → GIA/GIAentityNodeClass.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAentityNodeClass.h
* File Name: GIAentityNodeClass.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* NB a substance is an instance of an entity, any given entity may contain/comprise/have multiple substances - and substances are unrelated to definitions between entities [they just define what comprises any given entity]
*
*******************************************************************************/
Expand All @@ -37,9 +37,9 @@



#include "GIAconditionNodeClass.h"
#include "GIAglobalDefs.h"
#include "SHAREDvars.h"
#include "GIAconditionNodeClass.hpp"
#include "GIAglobalDefs.hpp"
#include "SHAREDvars.hpp"

#include <iostream>
#include <fstream>
Expand Down
6 changes: 3 additions & 3 deletions GIA/GIAglobalDefs.h → GIA/GIAglobalDefs.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAglobalsDefs.h
* File Name: GIAglobalsDefs.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires text parsed by NLP Parser (eg Relex; available in .CFF format <relations>)
* Description: GIA specific global definitions
*
Expand Down Expand Up @@ -722,7 +722,7 @@
#ifndef HEADER_GIA_GLOBAL_DEFS
#define HEADER_GIA_GLOBAL_DEFS

#include "SHAREDglobalDefs.h"
#include "SHAREDglobalDefs.hpp"

#ifdef USE_NLC
#define GIA_DISABLE_CROSS_SENTENCE_REFERENCING //added 2g5a/05-September-2014 - required for NLC 1j2b+, optional for NLC 1k11a+
Expand Down
4 changes: 2 additions & 2 deletions GIA/GIAlrp.cpp
Expand Up @@ -26,14 +26,14 @@
* File Name: GIAlrp.cpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires plain text file
* Description: Language Reduction Preprocessor
*
*******************************************************************************/


#include "GIAlrp.h"
#include "GIAlrp.hpp"

static string lrpDataFolderName;
static bool useLRP;
Expand Down
10 changes: 5 additions & 5 deletions GIA/GIAlrp.h → GIA/GIAlrp.hpp
Expand Up @@ -23,10 +23,10 @@

/*******************************************************************************
*
* File Name: GIAlrp.h
* File Name: GIAlrp.hpp
* Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
* Project: General Intelligence Algorithm
* Project Version: 2p3c 14-January-2017
* Project Version: 2p4a 17-January-2017
* Requirements: requires plain text file
* Description: Language Reduction Preprocessor
*
Expand All @@ -36,9 +36,9 @@
#ifndef HEADER_GIA_LRP
#define HEADER_GIA_LRP

#include "GIAglobalDefs.h"
#include "GIAsentenceClass.h"
#include "SHAREDvars.h" //file io
#include "GIAglobalDefs.hpp"
#include "GIAsentenceClass.hpp"
#include "SHAREDvars.hpp" //file io

#ifdef GIA_LRP_NLP_PARSABLE_PHRASE_SUPPORT_FILENAMES_WITH_FULLSTOPS_AND_FLOATS_AND_TIMES
#define GIA_LRP_NLP_PARSABLE_PHRASE_CHARACTERS_NUMBER_OF_TYPES (65) //must sync with NLC_PREPROCESSOR_MATH_NLP_PARSABLE_PHRASE_CHARACTERS_NUMBER_OF_TYPES
Expand Down

0 comments on commit d030771

Please sign in to comment.