Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling changes #227

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
26afb57
spelling: adjacent
jsoref Jun 14, 2023
303faa7
spelling: avoid
jsoref Jun 14, 2023
dd7235f
spelling: because
jsoref Jun 14, 2023
ad4f1bb
spelling: before
jsoref Jun 13, 2023
4677a2b
spelling: beginning
jsoref Jun 14, 2023
7e94b09
spelling: betweenness
jsoref Jun 14, 2023
622d1fc
spelling: centrality
jsoref Jun 14, 2023
5499182
spelling: characteristics
jsoref Jun 14, 2023
9c715d3
spelling: cleanup
jsoref Jun 14, 2023
58a49ac
spelling: coloring
jsoref Jun 14, 2023
4265361
spelling: community
jsoref Jun 14, 2023
4e8b69f
spelling: constraint
jsoref Jun 14, 2023
891c8d7
spelling: contiguously
jsoref Jun 14, 2023
07bfbd7
spelling: convergence
jsoref Jun 14, 2023
f67251c
spelling: cycle
jsoref Jun 14, 2023
18cc4d3
spelling: deprecated
jsoref Jun 14, 2023
b96d5e3
spelling: dissect
jsoref Jun 14, 2023
bae3c61
spelling: dominators
jsoref Jun 14, 2023
cdffb63
spelling: edges
jsoref Jun 14, 2023
740cbb1
spelling: empty
jsoref Jun 14, 2023
00d03ab
spelling: equitable
jsoref Jun 14, 2023
a1942b4
spelling: from
jsoref Jun 13, 2023
9bd38da
spelling: fundamental
jsoref Jun 14, 2023
7d3631a
spelling: generator
jsoref Jun 14, 2023
aa6c668
spelling: github
jsoref Jun 13, 2023
6b95873
spelling: graphs
jsoref Jun 14, 2023
8471d10
spelling: greater
jsoref Jun 14, 2023
2c27f7d
spelling: indexes
jsoref Jun 14, 2023
7e4e25a
spelling: intermediate
jsoref Jun 14, 2023
8a1bd22
spelling: kcomponents
jsoref Jun 14, 2023
0a81094
spelling: length
jsoref Jun 14, 2023
cf2603b
spelling: management
jsoref Jun 14, 2023
4f5799c
spelling: message
jsoref Jun 14, 2023
ee8130d
spelling: millisecond
jsoref Jun 14, 2023
3cfa191
spelling: neighbor
jsoref Jun 14, 2023
f5c3b88
spelling: neighbors
jsoref Jun 14, 2023
9f767c9
spelling: nonbipartite
jsoref Jun 14, 2023
7bc0163
spelling: number
jsoref Jun 14, 2023
b8bd701
spelling: ordered
jsoref Jun 13, 2023
70e3268
spelling: original
jsoref Jun 14, 2023
a8a3bab
spelling: overridden
jsoref Jun 14, 2023
8704c00
spelling: parameters
jsoref Jun 14, 2023
1193e30
spelling: percentage
jsoref Jun 14, 2023
8340981
spelling: probability
jsoref Jun 14, 2023
bbd7c8d
spelling: property
jsoref Jun 14, 2023
f3b4f68
spelling: redistributed
jsoref Jun 14, 2023
e786fc9
spelling: resolution
jsoref Jun 14, 2023
0fa67f1
spelling: similarity
jsoref Jun 14, 2023
8d662ed
spelling: successfully
jsoref Jun 14, 2023
8b8c103
spelling: swapping
jsoref Jun 14, 2023
50b2440
spelling: synchronizing
jsoref Jun 14, 2023
56c0305
spelling: tuple
jsoref Jun 14, 2023
8074ff5
spelling: utility
jsoref Jun 14, 2023
dc5ad46
spelling: variables
jsoref Jun 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ streaming graph algorithms! Drop us a message on the channels below:
<img src="https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white" alt="Discord"/>
</a>
<a href="https://github.com/memgraph">
<img src="https://img.shields.io/badge/Memgraph_GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="Memgraph Github"/>
<img src="https://img.shields.io/badge/Memgraph_GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="Memgraph GitHub"/>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brand

</a>
<a href="https://www.youtube.com/channel/UCZ3HOJvHGxtQ_JHxOselBYg">
<img src="https://img.shields.io/badge/YouTube-FF0000?style=for-the-badge&logo=youtube&logoColor=white" alt="Memgraph YouTube"/>
Expand Down Expand Up @@ -145,7 +145,7 @@ docker run -p 7687:7687 -p 7444:7444 memgraph/memgraph-mage

#### 2 Install MAGE with Docker build of the repository

**0.** Make sure that you have cloned the MAGE Github repository and positioned
**0.** Make sure that you have cloned the MAGE GitHub repository and positioned
yourself inside the repo in your terminal:

```bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class OnlineBC {
///
inline bool Initialized() const { return this->initialized; };

///@brief Computes initial betweennness centrality scores with Brandes’ algorithm.
///@brief Computes initial betweenness centrality scores with Brandes’ algorithm.
///
///@param graph Current graph
///@param normalize If true, normalizes each node’s betweenness centrality score by the number of node pairs not
Expand All @@ -194,8 +194,8 @@ class OnlineBC {
std::unordered_map<std::uint64_t, double> Set(const mg_graph::GraphView<> &graph, const bool normalize = true,
const std::uint64_t threads = std::thread::hardware_concurrency());

///@brief Returns previously computed betweennness centrality scores.
/// If this->computed flag is set to false, computes betweennness centrality scores with default parameter values.
///@brief Returns previously computed betweenness centrality scores.
/// If this->computed flag is set to false, computes betweenness centrality scores with default parameter values.
///
///@param graph Current graph
///@param normalize If true, normalizes each node’s betweenness centrality score by the number of node pairs not
Expand All @@ -205,7 +205,7 @@ class OnlineBC {
///@return {node ID, BC score} pairs
std::unordered_map<std::uint64_t, double> Get(const mg_graph::GraphView<> &graph, const bool normalize = true) const;

///@brief Uses iCentral to recompute betweennness centrality scores after edge updates.
///@brief Uses iCentral to recompute betweenness centrality scores after edge updates.
///
///@param prior_graph Graph as before the last update
///@param current_graph Current graph
Expand All @@ -222,7 +222,7 @@ class OnlineBC {
const std::pair<std::uint64_t, std::uint64_t> updated_edge, const bool normalize = true,
const std::uint64_t threads = std::thread::hardware_concurrency());

///@brief Uses a single iteration of Brandes’ algorithm to recompute betweennness centrality scores after updates
///@brief Uses a single iteration of Brandes’ algorithm to recompute betweenness centrality scores after updates
/// consisting of an edge and a node solely connected to it.
///
///@param current_graph Current graph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void Update(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_m

// Check if online update can be used
if (created_nodes.size() == 0 && deleted_nodes.size() == 0) { // Edge update
// Get edges as before before the update
// Get edges as before the update
std::vector<std::pair<std::uint64_t, std::uint64_t>> prior_edges_ids;
for (const auto edge_inner_ids : graph->Edges()) {
const std::pair<std::uint64_t, std::uint64_t> edge{graph->GetMemgraphNodeId(edge_inner_ids.from),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class LabelRankT {
///@brief Checks if given node’s label probabilities are sufficiently distinct
/// from its neighbors’.
/// For a label probability vector to be considered sufficiently distinct, it
/// has to be a subset of less than k% label probabilty vectors of its
/// has to be a subset of less than k% label probability vectors of its
/// neighbors.
///
///@param node_i -- given node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ double parallelLouvianMethodApprox2(graph *G, long *C, int nThreads, double Lowe
#endif
double time1, time2, time3, time4; //For timing purposes
double total = 0, totItr = 0;
//long percentange = clustering_parameters.percentage;
//long percentage = clustering_parameters.percentage;
long NV = G->numVertices;
long NS = G->sVertices;
long NE = G->numEdges;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ double parallelLouvianMethodApprox(graph *G, long *C, int nThreads, double Lower
#endif
double time1, time2, time3, time4; //For timing purposes
double total = 0, totItr = 0;
//long percentange = clustering_parameters.percentage;
//long percentage = clustering_parameters.percentage;
long NV = G->numVertices;
long NS = G->sVertices;
long NE = G->numEdges;
Expand Down Expand Up @@ -196,7 +196,7 @@ int x = NV*percentage/100;
Counter.clear();

}else {
targetCommAss[i]=currCommAss[i];//(int)rand()%(NV*percentange/100);
targetCommAss[i]=currCommAss[i];//(int)rand()%(NV*percentage/100);
}
//Update
if(targetCommAss[i] != currCommAss[i] && targetCommAss[i] != -1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void runMultiPhaseBasicDirected(graph *G, long *C_orig, int basicOpt, long minGr
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hopefully?

numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down Expand Up @@ -186,7 +186,7 @@ void runMultiPhaseBasicOnceDirected(graph *G, long *C_orig, int basicOpt, long m
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void runMultiPhaseBasic(graph *G, long *C_orig, int basicOpt, long minGraphSize,
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);
//Keep track of clusters in C_orig
if(phase == 1) {
Expand Down Expand Up @@ -185,7 +185,7 @@ void runMultiPhaseBasicOnce(graph *G, long *C_orig, int basicOpt, long minGraphS
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void runMultiPhaseBasicApprox(graph *G, long *C_orig, int basicOpt, long minGrap
int tmpItr=0, totItr = 0;
long NV = G->numVertices;

long percentange = 80;
long percentage = 80;
/* Step 1: Find communities */
double prevMod = -1;
double currMod = -1;
Expand Down Expand Up @@ -87,7 +87,7 @@ void runMultiPhaseBasicApprox(graph *G, long *C_orig, int basicOpt, long minGrap
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down
2 changes: 1 addition & 1 deletion cpp/community_detection_module/grappolo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Nitin A. Gawande, PNNL
# Oct 19, 2018

# set varaibles using nomenclature used in Makefile
# set variables using nomenclature used in Makefile
set(MODULE_DIR community_detection_module/grappolo)
set(COFOLDER BasicCommunitiesDetection)
set(UTFOLDER Utility)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ double algoLouvainWithDistOneColoring(graph* G, long *C, int nThreads, int* colo

double time1, time2, time3, time4; //For timing purposes
double total = 0, totItr = 0;
/* Indexs are vertex */
/* Indexes are vertex */
long* pastCommAss; //Store previous iteration's community assignment
long* currCommAss; //Store current community assignment
//long* targetCommAss; //Store the target of community assignment
double* vDegree; //Store each vertex's degree
double* clusterWeightInternal;//use for Modularity calculation (eii)

/* Indexs are community */
/* Indexes are community */
Comm* cInfo; //Community info. (ai and size)
Comm* cUpdate; //use for updating Community

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ double algoLouvainWithDistOneColoringNoMap(graph* G, long *C, int nThreads, int*

double time1, time2, time3, time4; //For timing purposes
double total = 0, totItr = 0;
/* Indexs are vertex */
/* Indexes are vertex */
long* pastCommAss; //Store previous iteration's community assignment
long* currCommAss; //Store current community assignment
//long* targetCommAss; //Store the target of community assignment
double* vDegree; //Store each vertex's degree
double* clusterWeightInternal;//use for Modularity calculation (eii)

/* Indexs are community */
/* Indexes are community */
Comm* cInfo; //Community info. (ai and size)
Comm* cUpdate; //use for updating Community

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void runMultiPhaseColoring(graph *G, long *C_orig, int coloring, int numColors,
totItr += tmpItr;
nonColor = true;
}
//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down
4 changes: 2 additions & 2 deletions cpp/community_detection_module/grappolo/Coloring/vBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "defs.h"
#include "coloring.h"

/* The redistritbuted coloring step, no balance */
/* The redistributed coloring step, no balance */
int vBaseRedistribution(graph* G, int* vtxColor, int ncolors, int type)
{
#ifdef PRINT_DETAILED_STATS_
Expand Down Expand Up @@ -81,7 +81,7 @@ int vBaseRedistribution(graph* G, int* vtxColor, int ncolors, int type)
if(freq[ci]>avg)
overSize[ci]= true;

/* Begining of Redistribution */
/* Beginning of Redistribution */
std::cout << "VR start "<< std::endl;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __UTILITLY__
#define __UTILITLY__
#ifndef __UTILITY__
#define __UTILITY__

// Define in buildNextPhase.cpp
long renumberClustersContiguously(long *C, long size);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ int algoColoringMultiHashMaxMin(graph *G, int *vtxColor, int nThreads, double *t
// In vBase.cpp
int vBaseRedistribution(graph* G, int* vtxColor, int ncolors, int type);

// In equtiableColoringDistanceOne.cpp
// In equitableColoringDistanceOne.cpp
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The filename is correctly spelled in version control, only this reference was wrong...

void buildColorSize(long NVer, int *vtxColor, int numColors, long *colorSize);
void computeVariance(long NVer, int numColors, long *colorSize);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void distanceOneConfResolution(graph* G, long v, int* vtxColor, double* randValu
void distanceOneChecked(graph* G, long nv ,int* colors);
void buildColorsIndex(int* colors, const int numColors, const long nv, ColorVector& colorPtr, ColorVector& colorIndex, ColorVector& binSizes);

/******* UtiliyFunctions *****
/******* UtilityFunctions *****
void computeBinSizes(ColorVector &binSizes, const ColorVector &colors, const GraphElem nv, const ColorElem numColors);
ColorElem getDegree(const GraphElem ci, const Graph &g);
void computeBinSizesWeighted(ColorVector &binSizes, const ColorVector &colors, const GraphElem nv, const ColorElem numColors, const Graph &g);
Expand All @@ -67,7 +67,7 @@ void generateRandomNumbers(std::vector<double> &randVec);

/* Basic coloring (unbalanced) in initialColoring.cpp
ColorElem initColoring(const Graph &g, ColorVector &colors, std::string input);
/* Basic coloiring (ab-inital) in initialColoringLU.cpp
/* Basic coloring (ab-inital) in initialColoringLU.cpp
ColorElem initColoringLU(const Graph &g, ColorVector &colors, std::string input);

/* Vertex base redistribution in vBase.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void MetisGraphPartitioner( graph *G, long *VertexPartitioning, int numParts ) {
VertexPartitioning[i] = (long) part[i]; //Do explicit typecasts
}

//Cleaup:
//Cleanup:
free(xadj); free(adjncy); free(adjwgt);
free(part);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
//
// ************************************************************************

#ifndef _graph_NestDisect_
#define _graph_NestDisect_
#ifndef _graph_NestDissect_
#define _graph_NestDissect_

/*
int METIS NodeND(idx t *nvtxs, idx t *xadj, idx t *adjncy, idx t *vwgt, idx t *options,
Expand Down Expand Up @@ -165,7 +165,7 @@ void MetisNDReorder( graph *G, long *old2NewMap ) {
old2NewMap[i] = (long) perm[i]; //Do explicit typecasts
}

//Cleaup:
//Cleanup:
free(xadj); free(adjncy); free(adjwgt);
free(perm); free(iperm);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ double parallelLouvianMethodEarlyTerminate(graph *G, long *C, int nThreads, doub
//totalUniqueComm += numUniqueClusters;

if((numItrs > 1) && (targetCommAss[i] == pastCommAss[i]) && (targetCommAss[i]==currCommAss[i]) ){
verT[i] = true; //Commuity assignment has not changed
verT[i] = true; //Community assignment has not changed
__sync_fetch_and_add(&termNodes, 1); //Update the number of terminated nodes
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ double parallelLouvainMethodFullSyncEarly(graph *G, long *C, int nThreads, doubl
//assert((targetCommAss[i] >= 0)&&(targetCommAss[i] < NV));

if(numItrs > 2 && C[i] == currCommAss[i] && pastCommAss[i]==currCommAss[i]){
//Swaping!!!
//Swapping!!!
verT[i] = true;
termNodes++;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void runMultiPhaseSyncType(graph *G, long *C_orig, int syncType, long minGraphSi
totTimeClustering += tmpTime;
totItr += tmpItr;

//Renumber the clusters contiguiously
//Renumber the clusters contiguously
numClusters = renumberClustersContiguously(C, G->numVertices);

//Keep track of clusters in C_orig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ double buildNextLevelGraphOpt(graph *Gin, graph *Gout, long *C, long numUniqueCl
}
#ifdef PRINT_DETAILED_STATS_
#endif
long percentange = 80;
long percentage = 80;
double time1, time2, TotTime=0; //For timing purposes
double total = 0, totItr = 0;
//Pointers into the input graph structure:
Expand Down Expand Up @@ -250,7 +250,7 @@ void buildNextLevelGraph(graph *Gin, graph *Gout, long *C, long numUniqueCluster
#endif
double time1, time2, time3, time4; //For timing purposes
double total = 0, totItr = 0;
long percentange = 80;
long percentage = 80;
//Pointers into the input graph structure:
long NV_in = Gin->numVertices;
long NE_in = Gin->numEdges;
Expand Down Expand Up @@ -411,7 +411,7 @@ long buildCommunityBasedOnVoltages(graph *G, long *Volts, long *C, long *Cvolts)
//Recursive call for finding neighbors
inline void Visit(long v, long myCommunity, short *Visited, long *Volts,
long* vtxPtr, edge* vtxInd, long *C) {
long adj1 = vtxPtr[v]; //Begining
long adj1 = vtxPtr[v]; //Beginning
long adj2 = vtxPtr[v+1]; //End
for(long i=adj1; i<adj2; i++) {
long w = vtxInd[i].tail;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void algoReverseCuthillMcKee( graph *G, long *pOrder, int nThreads )


//The Queue Data Structure for the Dominating Set:
//The Queues are important for synchornizing the concurrency:
//The Queues are important for synchronizing the concurrency:
//Have two queues - read from one, write into another
// at the end, swap the two.
long *Q = (long *) malloc (NV * sizeof(long)); assert(Q != 0);
Expand Down Expand Up @@ -302,7 +302,7 @@ void algoReverseCuthillMcKeeStrict( graph *G, long *pOrder, int nThreads )


//The Queue Data Structure for the Dominating Set:
//The Queues are important for synchornizing the concurrency:
//The Queues are important for synchronizing the concurrency:
//Have two queues - read from one, write into another
// at the end, swap the two.
long *Q = (long *) malloc (NV * sizeof(long)); assert(Q != 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void displayGraphCharacteristics(graph *G) {
long *vtxPtr = G->edgeListPtrs;
long tNV = NV; //Number of vertices

if ( (NS == 0)||(NS == NV) ) { //Nonbiparite graph
if ( (NS == 0)||(NS == NV) ) { //Nonbipartite graph
for (long i = 0; i < NV; i++) {
long degree = vtxPtr[i+1] - vtxPtr[i];
sum_sq += degree*degree;
Expand All @@ -202,7 +202,7 @@ void displayGraphCharacteristics(graph *G) {
}//End of nonbipartite graph
else { //Bipartite graph

//Compute characterisitcs from S side:
//Compute characteristics from S side:
for (long i = 0; i < NS; i++) {
long degree = vtxPtr[i+1] - vtxPtr[i];
sum_sq += degree*degree;
Expand All @@ -224,7 +224,7 @@ void displayGraphCharacteristics(graph *G) {
sum_sq = 0;
maxDegree = 0;
isolated = 0;
//Compute characterisitcs from T side:
//Compute characteristics from T side:
for (long i = NS; i < NV; i++) {
long degree = vtxPtr[i+1] - vtxPtr[i];
sum_sq += degree*degree;
Expand Down
Loading