Skip to content

Commit

Permalink
Apply .clang-format to gnm
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
Even Rouault reformatting bot authored and rouault committed Dec 17, 2022
1 parent d3829db commit b6f007e
Show file tree
Hide file tree
Showing 10 changed files with 1,034 additions and 976 deletions.
482 changes: 242 additions & 240 deletions gnm/gnm.h
View file

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions gnm/gnm_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,63 +39,63 @@ CPL_C_START
typedef void *GNMNetworkH;
typedef void *GNMGenericNetworkH;

const char CPL_DLL * CPL_STDCALL GNMGetName (GNMNetworkH hNet);
const char CPL_DLL *CPL_STDCALL GNMGetName(GNMNetworkH hNet);

int CPL_DLL CPL_STDCALL GNMGetVersion(GNMNetworkH hNet);

CPLErr CPL_DLL CPL_STDCALL GNMDisconnectAll (GNMNetworkH hNet);
CPLErr CPL_DLL CPL_STDCALL GNMDisconnectAll(GNMNetworkH hNet);

OGRFeatureH CPL_DLL CPL_STDCALL GNMGetFeatureByGlobalFID (GNMNetworkH hNet, GNMGFID nGFID);
OGRFeatureH CPL_DLL CPL_STDCALL GNMGetFeatureByGlobalFID(GNMNetworkH hNet,
GNMGFID nGFID);

OGRLayerH CPL_DLL CPL_STDCALL GNMGetPath (GNMNetworkH hNet, GNMGFID nStartFID,
GNMGFID nEndFID, GNMGraphAlgorithmType eAlgorithm,
char** papszOptions);
OGRLayerH CPL_DLL CPL_STDCALL GNMGetPath(GNMNetworkH hNet, GNMGFID nStartFID,
GNMGFID nEndFID,
GNMGraphAlgorithmType eAlgorithm,
char **papszOptions);

CPLErr CPL_DLL CPL_STDCALL GNMConnectFeatures (GNMGenericNetworkH hNet,
GNMGFID nSrcFID, GNMGFID nTgtFID,
GNMGFID nConFID, double dfCost,
double dfInvCost,
GNMDirection eDir);
CPLErr CPL_DLL CPL_STDCALL GNMConnectFeatures(GNMGenericNetworkH hNet,
GNMGFID nSrcFID, GNMGFID nTgtFID,
GNMGFID nConFID, double dfCost,
double dfInvCost,
GNMDirection eDir);

CPLErr CPL_DLL CPL_STDCALL GNMDisconnectFeatures (GNMGenericNetworkH hNet,
GNMGFID nSrcFID, GNMGFID nTgtFID,
GNMGFID nConFID);
CPLErr CPL_DLL CPL_STDCALL GNMDisconnectFeatures(GNMGenericNetworkH hNet,
GNMGFID nSrcFID,
GNMGFID nTgtFID,
GNMGFID nConFID);

CPLErr CPL_DLL CPL_STDCALL GNMDisconnectFeaturesWithId(GNMGenericNetworkH hNet,
GNMGFID nFID);

CPLErr CPL_DLL CPL_STDCALL GNMReconnectFeatures (GNMGenericNetworkH hNet,
GNMGFID nSrcFID, GNMGFID nTgtFID,
GNMGFID nConFID, double dfCost,
double dfInvCost, GNMDirection eDir);
CPLErr CPL_DLL CPL_STDCALL GNMReconnectFeatures(
GNMGenericNetworkH hNet, GNMGFID nSrcFID, GNMGFID nTgtFID, GNMGFID nConFID,
double dfCost, double dfInvCost, GNMDirection eDir);

CPLErr CPL_DLL CPL_STDCALL GNMCreateRule (GNMGenericNetworkH hNet,
const char *pszRuleStr);
CPLErr CPL_DLL CPL_STDCALL GNMCreateRule(GNMGenericNetworkH hNet,
const char *pszRuleStr);

CPLErr CPL_DLL CPL_STDCALL GNMDeleteAllRules(GNMGenericNetworkH hNet);

CPLErr CPL_DLL CPL_STDCALL GNMDeleteRule(GNMGenericNetworkH hNet,
const char *pszRuleStr);

char CPL_DLL ** CPL_STDCALL GNMGetRules(GNMGenericNetworkH hNet);
char CPL_DLL **CPL_STDCALL GNMGetRules(GNMGenericNetworkH hNet);

CPLErr CPL_DLL CPL_STDCALL GNMConnectPointsByLines (GNMGenericNetworkH hNet,
char **papszLayerList,
double dfTolerance,
double dfCost,
double dfInvCost,
GNMDirection eDir);
CPLErr CPL_DLL CPL_STDCALL GNMConnectPointsByLines(
GNMGenericNetworkH hNet, char **papszLayerList, double dfTolerance,
double dfCost, double dfInvCost, GNMDirection eDir);

CPLErr CPL_DLL CPL_STDCALL GNMChangeBlockState (GNMGenericNetworkH hNet,
GNMGFID nFID, bool bIsBlock);
CPLErr CPL_DLL CPL_STDCALL GNMChangeBlockState(GNMGenericNetworkH hNet,
GNMGFID nFID, bool bIsBlock);

CPLErr CPL_DLL CPL_STDCALL GNMChangeAllBlockState (GNMGenericNetworkH hNet,
int bIsBlock);
CPLErr CPL_DLL CPL_STDCALL GNMChangeAllBlockState(GNMGenericNetworkH hNet,
int bIsBlock);

GNMNetworkH CPL_DLL CPL_STDCALL GNMCastToNetwork(GDALMajorObjectH hBase);

GNMGenericNetworkH CPL_DLL CPL_STDCALL GNMCastToGenericNetwork(GDALMajorObjectH hBase);
GNMGenericNetworkH CPL_DLL CPL_STDCALL
GNMCastToGenericNetwork(GDALMajorObjectH hBase);

CPL_C_END

#endif // GNM_API
#endif // GNM_API
40 changes: 20 additions & 20 deletions gnm/gnm_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@
/* -------------------------------------------------------------------- */

// General constants.
#define GNM_VERSION "1.0"
#define GNM_VERSION_NUM 100 //major * 100 + minor
#define GNM_VERSION "1.0"
#define GNM_VERSION_NUM 100 // major * 100 + minor

// Obligatory system layers.
#define GNM_SYSLAYER_META "_gnm_meta"
#define GNM_SYSLAYER_GRAPH "_gnm_graph"
#define GNM_SYSLAYER_FEATURES "_gnm_features"
#define GNM_SYSLAYER_META "_gnm_meta"
#define GNM_SYSLAYER_GRAPH "_gnm_graph"
#define GNM_SYSLAYER_FEATURES "_gnm_features"

// System field names.
// FORMAT NOTE: Shapefile driver does not support field names more than 10
// characters.

#define GNM_SYSFIELD_PARAMNAME "key"
#define GNM_SYSFIELD_PARAMNAME "key"
#define GNM_SYSFIELD_PARAMVALUE "val"
#define GNM_SYSFIELD_SOURCE "source"
#define GNM_SYSFIELD_TARGET "target"
#define GNM_SYSFIELD_CONNECTOR "connector"
#define GNM_SYSFIELD_COST "cost"
#define GNM_SYSFIELD_INVCOST "inv_cost"
#define GNM_SYSFIELD_DIRECTION "direction"
#define GNM_SYSFIELD_GFID "gnm_fid"
#define GNM_SYSFIELD_LAYERNAME "ogrlayer"
#define GNM_SYSFIELD_BLOCKED "blocked"
#define GNM_SYSFIELD_PATHNUM "path_num"
#define GNM_SYSFIELD_TYPE "ftype"
#define GNM_SYSFIELD_SOURCE "source"
#define GNM_SYSFIELD_TARGET "target"
#define GNM_SYSFIELD_CONNECTOR "connector"
#define GNM_SYSFIELD_COST "cost"
#define GNM_SYSFIELD_INVCOST "inv_cost"
#define GNM_SYSFIELD_DIRECTION "direction"
#define GNM_SYSFIELD_GFID "gnm_fid"
#define GNM_SYSFIELD_LAYERNAME "ogrlayer"
#define GNM_SYSFIELD_BLOCKED "blocked"
#define GNM_SYSFIELD_PATHNUM "path_num"
#define GNM_SYSFIELD_TYPE "ftype"

// Rule strings key-words.
#define GNM_RULEKW_CONNECTS "CONNECTS"
Expand All @@ -74,8 +74,8 @@
#define GNM_RULEKW_ANY "ANY"

#define GNM_BLOCK_NONE 0x0000 // no blocking (vertex or edge)
#define GNM_BLOCK_SRC 0x0001 // the source vertex is blocked
#define GNM_BLOCK_TGT 0x0002 // the target vertext is blocked
#define GNM_BLOCK_SRC 0x0001 // the source vertex is blocked
#define GNM_BLOCK_TGT 0x0002 // the target vertext is blocked
#define GNM_BLOCK_CONN 0x0004 // the connection edge is blocked
#define GNM_BLOCK_ALL GNM_BLOCK_SRC | GNM_BLOCK_TGT | GNM_BLOCK_CONN

Expand All @@ -89,4 +89,4 @@
#define GetFieldAsGNMGFID GetFieldAsInteger64
#define GNMGFIDFormat CPL_FRMT_GIB

#endif // GNM_PRIV
#endif // GNM_PRIV
Loading

0 comments on commit b6f007e

Please sign in to comment.