More Cleanning

NeoResearch · Jun 15, 2020 · ba1eb09 · ba1eb09
1 parent 8df565b
commit ba1eb09
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 51 deletions.
diff --git a/commands_covert_lp.md b/commands_covert_lp.md
@@ -0,0 +1,37 @@
+# dbft 1.0
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified.mod --data 4Nodes_TMax20.dat --wcpxlp n4-dbft1.0.lp --check && mv n4-dbft1.0.lp ../python-mip
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified.mod --data 7Nodes_TMax20.dat --wcpxlp n7-dbft1.0.lp --check && mv n7-dbft1.0.lp ../python-mip
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified.mod --data 10Nodes_TMax30.dat --wcpxlp n10.lp --check
+
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified_withByzantines.mod --data 4Nodes_TMax20.dat --wcpxlp n4.lp --check
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified_withByzantines.mod --data 7Nodes_TMax20.dat --wcpxlp n7.lp --check
+glpsol --model MILP_BFTConsensus_dBFT1.0_Simplified_withByzantines.mod --data 10Nodes_TMax30.dat --wcpxlp n10.lp --check
+
+# dbft 2.0
+
+glpsol --model MILP_BFTConsensus_dBFT2.0.mod --data 4Nodes_TMax20.dat --wcpxlp n4-dbft-2.0.lp --check
+glpsol --model MILP_BFTConsensus_dBFT2.0.mod --data 7Nodes_TMax20.dat --wcpxlp n7.lp --check
+glpsol --model MILP_BFTConsensus_dBFT2.0.mod --data 10Nodes_TMax30.dat --wcpxlp n10.lp --check
+
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines.mod --data 4Nodes_TMax20.dat --wcpxlp n4-dbft-2.0-biz.lp --check && mv n4-dbft2.0-biz.lp ../python-mip/
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines.mod --data 7Nodes_TMax20.dat --wcpxlp n7-dbft-2.0-biz.lp --check && mv n7-dbft2.0-biz.lp ../python-mip/
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines.mod --data 10Nodes_TMax.dat --wcpxlp n10-dbft-2.0-biz.lp --check && mv n10-dbft2.0-biz.lp ../python-mip/
+
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines_liveness.mod --data 4Nodes_TMax.dat --wcpxlp n4-dbft2.0-biz-liveness.lp --check && mv n4-dbft2.0-biz-liveness.lp ../python-mip/ && (cd ../python-mip/ && python3 test-python-mip.py n4-dbft2.0-biz-liveness.lp)
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines_liveness.mod --data 7Nodes_TMax.dat --wcpxlp n7-dbft2.0-biz-liveness.lp --check && mv n7-dbft2.0-biz-liveness.lp ../python-mip/ && (cd ../python-mip/ && python3 test-python-mip.py n7-dbft2.0-biz-liveness.lp)
+glpsol --model MILP_BFTConsensus_dBFT2.0_withByzantines_liveness.mod --data 10Nodes_TMax.dat --wcpxlp n10-dbft2.0-biz-liveness.lp --check && mv n10-dbft2.0-biz-liveness.lp ../python-mip/ && (cd ../python-mip/ && python3 test-python-mip.py n10-dbft2.0-biz-liveness.lp)
+
+# dbft 3.0
+
+glpsol --model MILP_BFTConsensus_dBFT3.0_2P.mod --data 4Nodes_TMax20.dat --wcpxlp n4-dbft3.0-biz.lp --check && mv n4-dbft3.0-biz.lp ../python-mip/ && (cd ../python-mip/ && python3 test-python-mip.py n4-dbft3.0-biz.lp)
+glpsol --model MILP_BFTConsensus_dBFT3.0_2P.mod --data 7Nodes_TMax20.dat --wcpxlp n7-dbft3.0-biz.lp --check && mv n7-dbft3.0-biz.lp ../python-mip/
+glpsol --model MILP_BFTConsensus_dBFT3.0_2P.mod --data 10Nodes_TMax30.dat --wcpxlp n10-dbft3.0-biz.lp --check && mv n10-dbft3.0-biz.lp ../python-mip/
+
+
+# Cplex guide
+
+cplex
+r arq.lp
+o
+w soln4.sol
+w soln7.sol
diff --git a/dbft1.0/comando_converter_LP b/dbft1.0/comando_converter_LP
diff --git a/dbft2.0-liveness/.gitignore b/dbft2.0-liveness/.gitignore
diff --git a/dbft2.0-liveness/README.md b/dbft2.0-liveness/README.md
diff --git a/dbft2.0-liveness/comando_converter_LP b/dbft2.0-liveness/comando_converter_LP
diff --git a/dbft2.0/README.md b/dbft2.0/README.md
@@ -1,11 +1,12 @@
 Here you may find two models:
 
-1. `MILP_BFTConsensus_dBFT2.0`: which is similar to the one at dBFT1.0 defined as `MILP_BFTConsensus_dBFT1.0_Simplified`
+1. `dbft2.0`: which is similar to the one at dBFT1.0 defined as `MILP_BFTConsensus_dBFT1.0_Simplified`
 
-2. `MILP_BFTConsensus_dBFT2.0_withByzantines`: which has constraints more relaxed in order to allow byzantine nodes to play with their choices. This relaxed model was also investigated for dBFT 1.0, however, due to the lack of commit phase this relaxation could easily make production of `N` spoorks (on the other hand, easily detected by the community at that time - In the best of our knowledge, any case like that ever happened on NEO network, just sporks due to network delays).
+2. `dbft2.0_Byz`: which has constraints more relaxed in order to allow byzantine nodes to play with their choices. This relaxed model was also investigated for dBFT 1.0, however, due to the lack of commit phase this relaxation could easily make production of `N` spoorks (on the other hand, easily detected by the community at that time - In the best of our knowledge, any case like that ever happened on NEO network, just sporks due to network delays).
 
+3. `dbft2.0_Byz_Liveness`: Most recent model focused on testing Liveness
 
-# Best sol
+# Best sol 1. and 2.
 
 * T1 - NULL
 * T2 - SEND PREPREQ

diff --git a/dbft2.0/comando_converter_LP b/dbft2.0/comando_converter_LP
diff --git a/dbft2.0/MILP_BFTConsensus_dBFT2.0.mod → dbft2.0/dbft2.0.mod b/dbft2.0/MILP_BFTConsensus_dBFT2.0.mod → dbft2.0/dbft2.0.mod
diff --git a/...P_BFTConsensus_dBFT2.0_withByzantines.mod → dbft2.0/dbft2.0_Byz.mod b/...P_BFTConsensus_dBFT2.0_withByzantines.mod → dbft2.0/dbft2.0_Byz.mod
diff --git a/dbft2.0-liveness/dbft2.0_Byz_Liveness.mod → dbft2.0/dbft2.0_Byz_Liveness.mod b/dbft2.0-liveness/dbft2.0_Byz_Liveness.mod → dbft2.0/dbft2.0_Byz_Liveness.mod
diff --git a/dbft3.0/comando_converter_LP b/dbft3.0/comando_converter_LP
diff --git a/dbft3.0/MILP_BFTConsensus_dBFT3.0_2P.mod → dbft3.0/dbft3.0_2P.mod b/dbft3.0/MILP_BFTConsensus_dBFT3.0_2P.mod → dbft3.0/dbft3.0_2P.mod