Skip to content

Commit d04293d

Browse files
committed
scripts
1 parent ffb7581 commit d04293d

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

MCL.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ help()
1212
echo "rand_seed : random seed number"
1313
}
1414

15-
QUERY="java -jar bin/PS-MCL.jar -mcl $1 $2 -hem 0 0 -basic 1 $3 0"
15+
QUERY="java -jar bin/PS-MCL.jar -mcl $1 $2 -hem 0 0 -basic 1 $3 $4"
1616

1717
echo $QUERY
1818
echo =====================

MLR-MCL.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ help()
88
echo "B-MCL : Balanced Regularized Markov Clustering"
99
echo " "
1010
echo "Usage: $0 [INPUT (Graph File)] [OutputPath] [Coarse Level] [Balance Factor] [epsilon] [rand_seed]"
11-
echo "CoarseMode : -sc or -hem"
1211
echo "Coarse Level : non-negative Integer"
1312
echo "Balance Factor : non-negative Double"
1413
echo "epsilon : run until the error is under epsilon"
1514
echo "rand_seed : random seed number"
1615
}
1716

1817

19-
QUERY="java -jar bin/PS-MCL.jar -mcl $1 $2 -hem $3 $4 -reg 1 $5 0"
18+
QUERY="java -jar bin/PS-MCL.jar -mcl $1 $2 -hem $3 $4 -reg 1 $5 $6"
2019

2120

2221

src/mcl/MCL.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,7 @@ else if (args[6].equals("-basic"))
10201020
numThread = Integer.parseInt(args[7]);
10211021
} catch (Exception e) {
10221022
System.out.println("Please set the number of thread");
1023+
return;
10231024
}
10241025
if (numThread < 1) {
10251026
System.out.println("# of Threads should be non-negative");
@@ -1030,7 +1031,8 @@ else if (args[6].equals("-basic"))
10301031
try {
10311032
elipson = Double.parseDouble(args[8]);
10321033
} catch (Exception e) {
1033-
System.out.println("Please set the threshlod for stop MCL");
1034+
System.out.println("Please set threshlod to stop MCL");
1035+
return;
10341036
}
10351037
if (numThread < 0) {
10361038
System.out.println("Please set positive threshold");
@@ -1041,7 +1043,7 @@ else if (args[6].equals("-basic"))
10411043
try {
10421044
seed = Integer.parseInt(args[9]);
10431045
} catch (Exception e) {
1044-
System.out.println("Please set the random seed number");
1046+
System.out.println("Using random seed");
10451047
}
10461048

10471049
double skiprate=0.5;
@@ -1050,7 +1052,8 @@ else if (args[6].equals("-basic"))
10501052
try {
10511053
skiprate = Double.parseDouble(args[10]);
10521054
} catch (Exception e) {
1053-
System.out.println("Please set the threshlod for stop MCL");
1055+
System.out.println("Using default skip rate = 0.5");
1056+
10541057
}
10551058
if( skiprate <= 0 || skiprate >=1) {
10561059
System.out.println("Please set skip rate between 0 to 1 ");
@@ -1097,7 +1100,8 @@ else if(args[4].equals("-col"))
10971100
}
10981101

10991102
ClusterMeasure cm;
1100-
cm = new ClusterMeasure(args[1], args[2], args[3], type, max, min);
1103+
cm = new ClusterMeasure(args[1], args[2], args[3], type, max, min);
1104+
System.out.println();
11011105
System.out.println("Accuracy : " + cm.Accuracy());
11021106
}
11031107
}

0 commit comments

Comments
 (0)