Skip to content

Commit 64cb39b

Browse files
gadcamgadcam
committed
Move files to better path
1 parent 32c248a commit 64cb39b

28 files changed

+94
-90
lines changed

Diff for: ‎PaySim.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#PaySim parameters
22
seed=time
33
nbSteps=720
4-
multiplier=0.05
5-
nbClients=600000
4+
multiplier=1
5+
nbClients=20000
66
nbFraudsters=1000
77
nbMerchants=34749
88
nbBanks=5

Diff for: ‎src/paysim/PaySim.java renamed to ‎src/main/java/org/paysim/paysim/PaySim.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim;
1+
package org.paysim.paysim;
22

33
import java.io.File;
44
import java.text.DateFormat;
@@ -7,19 +7,19 @@
77

88
import sim.engine.SimState;
99

10-
import paysim.parameters.*;
10+
import org.paysim.paysim.parameters.*;
1111

12-
import paysim.actors.Bank;
13-
import paysim.actors.Client;
14-
import paysim.actors.Fraudster;
15-
import paysim.actors.Merchant;
16-
import paysim.actors.networkdrugs.NetworkDrug;
12+
import org.paysim.paysim.actors.Bank;
13+
import org.paysim.paysim.actors.Client;
14+
import org.paysim.paysim.actors.Fraudster;
15+
import org.paysim.paysim.actors.Merchant;
16+
import org.paysim.paysim.actors.networkdrugs.NetworkDrug;
1717

18-
import paysim.base.Transaction;
19-
import paysim.base.ClientActionProfile;
20-
import paysim.base.StepActionProfile;
18+
import org.paysim.paysim.base.Transaction;
19+
import org.paysim.paysim.base.ClientActionProfile;
20+
import org.paysim.paysim.base.StepActionProfile;
2121

22-
import paysim.output.Output;
22+
import org.paysim.paysim.output.Output;
2323

2424
public class PaySim extends SimState {
2525
public static final double PAYSIM_VERSION = 1.0;

Diff for: ‎src/paysim/actors/Bank.java renamed to ‎src/main/java/org/paysim/paysim/actors/Bank.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

33
public class Bank extends SuperActor {
44
private static final String BANK_IDENTIFIER = "B";

Diff for: ‎src/paysim/actors/Client.java renamed to ‎src/main/java/org/paysim/paysim/actors/Client.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

33
import java.util.Arrays;
44
import java.util.HashMap;
@@ -10,18 +10,18 @@
1010
import sim.engine.Steppable;
1111
import sim.util.distribution.Binomial;
1212

13-
import paysim.PaySim;
13+
import org.paysim.paysim.PaySim;
1414

15-
import paysim.base.ClientActionProfile;
16-
import paysim.base.ClientProfile;
17-
import paysim.base.StepActionProfile;
18-
import paysim.base.Transaction;
15+
import org.paysim.paysim.base.ClientActionProfile;
16+
import org.paysim.paysim.base.ClientProfile;
17+
import org.paysim.paysim.base.StepActionProfile;
18+
import org.paysim.paysim.base.Transaction;
1919

20-
import paysim.parameters.ActionTypes;
21-
import paysim.parameters.Parameters;
22-
import paysim.parameters.BalancesClients;
20+
import org.paysim.paysim.parameters.ActionTypes;
21+
import org.paysim.paysim.parameters.Parameters;
22+
import org.paysim.paysim.parameters.BalancesClients;
2323

24-
import paysim.utils.RandomCollection;
24+
import org.paysim.paysim.utils.RandomCollection;
2525

2626

2727
public class Client extends SuperActor implements Steppable {

Diff for: ‎src/paysim/actors/Fraudster.java renamed to ‎src/main/java/org/paysim/paysim/actors/Fraudster.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

33
import java.util.ArrayList;
44

55
import sim.engine.SimState;
66
import sim.engine.Steppable;
77

8-
import paysim.PaySim;
9-
import paysim.parameters.Parameters;
8+
import org.paysim.paysim.PaySim;
9+
import org.paysim.paysim.parameters.Parameters;
1010

11-
import paysim.output.Output;
11+
import org.paysim.paysim.output.Output;
1212

1313
public class Fraudster extends SuperActor implements Steppable {
1414
private static final String FRAUDSTER_IDENTIFIER = "C";

Diff for: ‎src/paysim/actors/Merchant.java renamed to ‎src/main/java/org/paysim/paysim/actors/Merchant.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

33
public class Merchant extends SuperActor {
44
private static final String MERCHANT_IDENTIFIER = "M";

Diff for: ‎src/paysim/actors/Mule.java renamed to ‎src/main/java/org/paysim/paysim/actors/Mule.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

3-
import paysim.PaySim;
4-
import paysim.base.Transaction;
3+
import org.paysim.paysim.PaySim;
4+
import org.paysim.paysim.base.Transaction;
55

66
public class Mule extends Client {
77
private static final String MULE_IDENTIFIER = "C";

Diff for: ‎src/paysim/actors/SuperActor.java renamed to ‎src/main/java/org/paysim/paysim/actors/SuperActor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.actors;
1+
package org.paysim.paysim.actors;
22

33
class SuperActor {
44
private final String name;

Diff for: ‎src/paysim/actors/networkdrugs/DrugConsumer.java renamed to ‎src/main/java/org/paysim/paysim/actors/networkdrugs/DrugConsumer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package paysim.actors.networkdrugs;
1+
package org.paysim.paysim.actors.networkdrugs;
22

33
import ec.util.MersenneTwisterFast;
4-
import paysim.parameters.Parameters;
4+
import org.paysim.paysim.parameters.Parameters;
55
import sim.engine.SimState;
66

7-
import paysim.PaySim;
8-
import paysim.actors.Client;
9-
import paysim.utils.RandomCollection;
7+
import org.paysim.paysim.PaySim;
8+
import org.paysim.paysim.actors.Client;
9+
import org.paysim.paysim.utils.RandomCollection;
1010

1111
public class DrugConsumer extends Client {
1212
private DrugDealer dealer;

Diff for: ‎src/paysim/actors/networkdrugs/DrugDealer.java renamed to ‎src/main/java/org/paysim/paysim/actors/networkdrugs/DrugDealer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package paysim.actors.networkdrugs;
1+
package org.paysim.paysim.actors.networkdrugs;
22

33
import sim.engine.SimState;
44

5-
import paysim.PaySim;
6-
import paysim.actors.Client;
5+
import org.paysim.paysim.PaySim;
6+
import org.paysim.paysim.actors.Client;
77

88
public class DrugDealer extends Client {
99
private double thresholdForCashOut;

Diff for: ‎src/paysim/actors/networkdrugs/NetworkDrug.java renamed to ‎src/main/java/org/paysim/paysim/actors/networkdrugs/NetworkDrug.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package paysim.actors.networkdrugs;
1+
package org.paysim.paysim.actors.networkdrugs;
22

33
import ec.util.MersenneTwisterFast;
44
import org.apache.tinkerpop.gremlin.structure.*;
55

6-
import PaySim;
7-
import paysim.utils.GraphUtils;
8-
import paysim.utils.RandomCollection;
6+
import org.paysim.paysim.PaySim;
7+
import org.paysim.paysim.utils.GraphUtils;
8+
import org.paysim.paysim.utils.RandomCollection;
99

1010
import java.util.Map;
1111

Diff for: ‎src/paysim/base/ClientActionProfile.java renamed to ‎src/main/java/org/paysim/paysim/base/ClientActionProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.base;
1+
package org.paysim.paysim.base;
22

33
public class ClientActionProfile {
44
private final String action;

Diff for: ‎src/paysim/base/ClientProfile.java renamed to ‎src/main/java/org/paysim/paysim/base/ClientProfile.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package paysim.base;
1+
package org.paysim.paysim.base;
22

33
import java.util.HashMap;
44
import java.util.Map;
55
import java.util.stream.Collectors;
66

77
import ec.util.MersenneTwisterFast;
88

9-
import paysim.parameters.ActionTypes;
9+
import org.paysim.paysim.parameters.ActionTypes;
1010

1111
public class ClientProfile {
1212
private Map<String, ClientActionProfile> profile;

Diff for: ‎src/paysim/base/StepActionProfile.java renamed to ‎src/main/java/org/paysim/paysim/base/StepActionProfile.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package paysim.base;
1+
package org.paysim.paysim.base;
22

33
import java.util.ArrayList;
44

5-
import paysim.output.Output;
5+
import org.paysim.paysim.output.Output;
66

77
public class StepActionProfile {
88
private final String action;

Diff for: ‎src/paysim/base/Transaction.java renamed to ‎src/main/java/org/paysim/paysim/base/Transaction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package paysim.base;
1+
package org.paysim.paysim.base;
22

33
import java.io.Serializable;
44
import java.util.ArrayList;
55

6-
import paysim.output.Output;
6+
import org.paysim.paysim.output.Output;
77

88
public class Transaction implements Serializable {
99
private static final long serialVersionUID = 1L;

Diff for: ‎src/paysim/output/Aggregator.java renamed to ‎src/main/java/org/paysim/paysim/output/Aggregator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package paysim.output;
1+
package org.paysim.paysim.output;
22

33
import java.math.BigDecimal;
44
import java.util.ArrayList;
55
import java.util.HashMap;
66
import java.util.Map;
77
import java.util.stream.Collectors;
88

9-
import paysim.parameters.ActionTypes;
9+
import org.paysim.paysim.parameters.ActionTypes;
1010

11-
import paysim.base.Transaction;
12-
import paysim.base.StepActionProfile;
11+
import org.paysim.paysim.base.Transaction;
12+
import org.paysim.paysim.base.StepActionProfile;
1313

1414
class Aggregator {
1515
private static final int DOUBLE_PRECISION = 2;

Diff for: ‎src/paysim/output/Output.java renamed to ‎src/main/java/org/paysim/paysim/output/Output.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.output;
1+
package org.paysim.paysim.output;
22

33
import java.io.BufferedWriter;
44
import java.io.File;
@@ -7,14 +7,14 @@
77
import java.util.ArrayList;
88
import java.util.Map;
99

10-
import paysim.PaySim;
11-
import paysim.base.StepActionProfile;
12-
import paysim.base.ClientActionProfile;
13-
import paysim.base.Transaction;
14-
import paysim.actors.Fraudster;
15-
import paysim.parameters.Parameters;
16-
import paysim.parameters.StepsProfiles;
17-
import paysim.utils.DatabaseHandler;
10+
import org.paysim.paysim.PaySim;
11+
import org.paysim.paysim.base.StepActionProfile;
12+
import org.paysim.paysim.base.ClientActionProfile;
13+
import org.paysim.paysim.base.Transaction;
14+
import org.paysim.paysim.actors.Fraudster;
15+
import org.paysim.paysim.parameters.Parameters;
16+
import org.paysim.paysim.parameters.StepsProfiles;
17+
import org.paysim.paysim.utils.DatabaseHandler;
1818

1919
public class Output {
2020
public static final int PRECISION_OUTPUT = 2;

Diff for: ‎src/paysim/output/SummaryBuilder.java renamed to ‎src/main/java/org/paysim/paysim/output/SummaryBuilder.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package paysim.output;
1+
package org.paysim.paysim.output;
22

33
import java.util.*;
44
import java.util.function.Function;
55

6-
import paysim.base.StepActionProfile;
7-
import paysim.parameters.ActionTypes;
8-
import paysim.parameters.StepsProfiles;
6+
import org.paysim.paysim.base.StepActionProfile;
7+
import org.paysim.paysim.parameters.ActionTypes;
8+
import org.paysim.paysim.parameters.StepsProfiles;
99

1010
class SummaryBuilder {
1111
private static final String SEPARATOR = "----------------------------------------------------";

Diff for: ‎src/paysim/parameters/ActionTypes.java renamed to ‎src/main/java/org/paysim/paysim/parameters/ActionTypes.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
import java.util.HashMap;
44
import java.util.Map;
55
import java.util.Set;
66
import java.util.TreeSet;
77
import java.util.ArrayList;
88

9-
import paysim.utils.CSVReader;
9+
import org.paysim.paysim.utils.CSVReader;
1010

1111
public class ActionTypes {
1212
private static final int COLUMN_ACTION = 0, COLUMN_OCCURRENCES = 1;

Diff for: ‎src/paysim/parameters/BalancesClients.java renamed to ‎src/main/java/org/paysim/paysim/parameters/BalancesClients.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
import java.util.ArrayList;
44
import java.util.InputMismatchException;
@@ -7,8 +7,8 @@
77

88
import ec.util.MersenneTwisterFast;
99

10-
import paysim.utils.CSVReader;
11-
import paysim.utils.RandomCollection;
10+
import org.paysim.paysim.utils.CSVReader;
11+
import org.paysim.paysim.utils.RandomCollection;
1212

1313
public class BalancesClients {
1414
private static final int COLUMN_LOW = 0, COLUMN_HIGH = 1, COLUMN_PROB = 2;

Diff for: ‎src/paysim/parameters/ClientsProfiles.java renamed to ‎src/main/java/org/paysim/paysim/parameters/ClientsProfiles.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
import java.util.ArrayList;
44
import java.util.Collection;
@@ -7,9 +7,9 @@
77

88
import ec.util.MersenneTwisterFast;
99

10-
import paysim.base.ClientActionProfile;
11-
import paysim.utils.CSVReader;
12-
import paysim.utils.RandomCollection;
10+
import org.paysim.paysim.base.ClientActionProfile;
11+
import org.paysim.paysim.utils.CSVReader;
12+
import org.paysim.paysim.utils.RandomCollection;
1313

1414
public class ClientsProfiles {
1515
private static final int COLUMN_ACTION = 0, COLUMN_LOW = 1, COLUMN_HIGH = 2, COLUMN_AVG = 3, COLUMN_STD = 4, COLUMN_FREQ = 5;

Diff for: ‎src/paysim/parameters/Parameters.java renamed to ‎src/main/java/org/paysim/paysim/parameters/Parameters.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
import java.io.FileInputStream;
44
import java.util.ArrayList;
55
import java.util.Properties;
66

7-
import paysim.output.Output;
7+
import org.paysim.paysim.output.Output;
88

99
public class Parameters {
1010
private static String seedString;

Diff for: ‎src/paysim/parameters/StepsProfiles.java renamed to ‎src/main/java/org/paysim/paysim/parameters/StepsProfiles.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
import java.util.ArrayList;
44
import java.util.Collections;
@@ -7,9 +7,9 @@
77
import java.util.function.Function;
88
import java.util.stream.Collectors;
99

10-
import paysim.utils.CSVReader;
10+
import org.paysim.paysim.utils.CSVReader;
1111

12-
import paysim.base.StepActionProfile;
12+
import org.paysim.paysim.base.StepActionProfile;
1313

1414

1515
public class StepsProfiles {

Diff for: ‎src/paysim/parameters/TypologiesFiles.java renamed to ‎src/main/java/org/paysim/paysim/parameters/TypologiesFiles.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.parameters;
1+
package org.paysim.paysim.parameters;
22

33
public class TypologiesFiles {
44
public static final String drugNetworkOne = "DrugNetworkOne.graphml";

Diff for: ‎src/paysim/utils/CSVReader.java renamed to ‎src/main/java/org/paysim/paysim/utils/CSVReader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package paysim.utils;
1+
package org.paysim.paysim.utils;
22

33
import java.io.BufferedReader;
44
import java.io.FileReader;

Diff for: ‎src/paysim/utils/DatabaseHandler.java renamed to ‎src/main/java/org/paysim/paysim/utils/DatabaseHandler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package paysim.utils;
1+
package org.paysim.paysim.utils;
22

3-
import paysim.base.Transaction;
3+
import org.paysim.paysim.base.Transaction;
44

55
import java.sql.DriverManager;
66

@@ -27,7 +27,7 @@ public DatabaseHandler(String url, String user, String password) {
2727

2828
public void insert(String simulatorName, Transaction trans) {
2929
try {
30-
String sql = "INSERT INTO paysim.paysimLog (logName, pType, pAmount, cliFrom,pOldBalanceFrom,pNewBalanceFrom,"
30+
String sql = "INSERT INTO org.paysim.paysim.paysimLog (logName, pType, pAmount, cliFrom,pOldBalanceFrom,pNewBalanceFrom,"
3131
+ "cliTo,pOldBalanceTo,pNewBalanceTo,isFraud,isFlaggedFraud,step) "
3232
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?);";
3333
PreparedStatement st = con.prepareStatement(sql);

0 commit comments

Comments
 (0)