Skip to content

Spelling changes #227

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

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0bcbe4c
spelling: adjacent
jsoref Jun 14, 2023
8332266
spelling: avoid
jsoref Jun 14, 2023
6ccc6c2
spelling: because
jsoref Jun 14, 2023
c9db218
spelling: before
jsoref Jun 13, 2023
d3da350
spelling: beginning
jsoref Jun 14, 2023
6384890
spelling: betweenness
jsoref Jun 14, 2023
18b6f05
spelling: centrality
jsoref Jun 14, 2023
ca70833
spelling: characteristics
jsoref Jun 14, 2023
fae7cc4
spelling: cleanup
jsoref Jun 14, 2023
f8a9bd8
spelling: coloring
jsoref Jun 14, 2023
3660f71
spelling: community
jsoref Jun 14, 2023
2a3a4b6
spelling: constraint
jsoref Jun 14, 2023
e8322d9
spelling: contiguously
jsoref Jun 14, 2023
7554cc9
spelling: convergence
jsoref Jun 14, 2023
7e48155
spelling: cycle
jsoref Jun 14, 2023
62c5562
spelling: deprecated
jsoref Jun 14, 2023
33cac9b
spelling: dissect
jsoref Jun 14, 2023
4ec7be6
spelling: dominators
jsoref Jun 14, 2023
dbf4607
spelling: edges
jsoref Jun 14, 2023
3e0efd8
spelling: empty
jsoref Jun 14, 2023
3818944
spelling: equitable
jsoref Jun 14, 2023
36eb734
spelling: from
jsoref Jun 13, 2023
c29665d
spelling: fundamental
jsoref Jun 14, 2023
2f2ddcc
spelling: github
jsoref Jun 13, 2023
dc4e072
spelling: graphs
jsoref Jun 14, 2023
6b43c0f
spelling: greater
jsoref Jun 14, 2023
b73404b
spelling: indexes
jsoref Jun 14, 2023
2e40beb
spelling: intermediate
jsoref Jun 14, 2023
76dd099
spelling: kcomponents
jsoref Jun 14, 2023
e966666
spelling: length
jsoref Jun 14, 2023
d49c94b
spelling: management
jsoref Jun 14, 2023
9e61209
spelling: message
jsoref Jun 14, 2023
3176ed7
spelling: millisecond
jsoref Jun 14, 2023
b69fb3e
spelling: neighbor
jsoref Jun 14, 2023
f079f47
spelling: neighbors
jsoref Jun 14, 2023
31a17bf
spelling: nonbipartite
jsoref Jun 14, 2023
207aa9f
spelling: number
jsoref Jun 14, 2023
4782be6
spelling: ordered
jsoref Jun 13, 2023
4aa20d6
spelling: original
jsoref Jun 14, 2023
7283c3f
spelling: overridden
jsoref Jun 14, 2023
83f3f8b
spelling: parameters
jsoref Jun 14, 2023
f08e4e3
spelling: percentage
jsoref Jun 14, 2023
025079b
spelling: property
jsoref Jun 14, 2023
1bd5c3f
spelling: redistributed
jsoref Jun 14, 2023
8561f05
spelling: resolution
jsoref Jun 14, 2023
0a88d64
spelling: similarity
jsoref Jun 14, 2023
b6ea409
spelling: successfully
jsoref Jun 14, 2023
05a4d4c
spelling: swapping
jsoref Jun 14, 2023
e4fbad4
spelling: synchronizing
jsoref Jun 14, 2023
c7789df
spelling: tuple
jsoref Jun 14, 2023
d2f203c
spelling: utility
jsoref Jun 14, 2023
e2fc125
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"/>
</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 @@ -146,7 +146,7 @@ docker run -p 7687:7687 -p 7444:7444 memgraph/memgraph-mage

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

**0. a** Make sure that you have cloned the MAGE Github repository and positioned
**0. a** 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 @@ -188,7 +188,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 @@ -200,8 +200,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 @@ -211,7 +211,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 @@ -228,7 +228,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 @@ -137,7 +137,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 @@ -65,7 +65,7 @@ double parallelLouvianMethodApprox2(graph *G, mgp_graph *mg_graph, long *C, int
#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 @@ -64,7 +64,7 @@ double parallelLouvianMethodApprox(graph *G, mgp_graph *mg_graph, long *C, int n
#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 @@ -201,7 +201,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 @@ -88,7 +88,7 @@ void runMultiPhaseBasicDirected(graph *G, mgp_graph *mg_graph, long *C_orig, int
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 Expand Up @@ -187,7 +187,7 @@ void runMultiPhaseBasicOnceDirected(graph *G, mgp_graph *mg_graph, long *C_orig,
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 @@ -89,7 +89,7 @@ void runMultiPhaseBasic(graph *G, mgp_graph *mg_graph, long *C_orig, int basicOp
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 @@ -186,7 +186,7 @@ void runMultiPhaseBasicOnce(graph *G, mgp_graph *mg_graph, long *C_orig, int bas
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, mgp_graph *mg_graph, long *C_orig, int b
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, mgp_graph *mg_graph, long *C_orig, int b
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 @@ -63,14 +63,14 @@ double algoLouvainWithDistOneColoring(graph* G, mgp_graph *mg_graph, long *C, in

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 @@ -119,7 +119,7 @@ void runMultiPhaseColoring(graph *G, mgp_graph *mg_graph, long *C_orig, int colo
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
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 @@ -111,7 +111,7 @@ void runMultiPhaseSyncType(graph *G, mgp_graph *mg_graph, long *C_orig, int sync
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 @@ -94,7 +94,7 @@ double buildNextLevelGraphOpt(graph *Gin, mgp_graph *mg_graph, graph *Gout, long
}
#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 @@ -271,7 +271,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 @@ -432,7 +432,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 @@ -303,7 +303,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
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ double* computeEdgeSimilarityMetrics(graph *G) {
}//End of while(c1,c2)
//Now compute the similarity score:
double similarity = 0;
if (setUnion > 0) //Avoind division by zero
if (setUnion > 0) //Avoid division by zero
similarity = setIntersect / setUnion;
simWeights[i] = similarity;
//Find the position for edge (w --> v)
Expand Down Expand Up @@ -257,7 +257,7 @@ graph* buildSparifiedGraph(graph *Gin, double alpha) {
//Process all the neighbors of v:
for(long i = adj1+1; i < adj2; i++ ) {
//Always maintain the least weighted neighbor for each vertex;
//... this neigbor will get bounced if there is no space
//... this neighbor will get bounced if there is no space
if(edgesAddedSoFar < numTopEdges) {
//Add the current edge to the list of top-k edges:
isEdgePresent[i] = true; //Mark this edge as true
Expand Down
Loading
Loading