Skip to content

Commit 962da66

Browse files
authored
Merge pull request #45 from Critical-Infrastructure-Systems-Lab/dev
New DHALSIM release
2 parents ee0cf42 + 1d93a7a commit 962da66

File tree

151 files changed

+6881
-3162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+6881
-3162
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ In order to offer a simple installation we have included an installation script
1313

1414
## Running
1515

16-
DHALSIM can be run using the command ```sudo dhalsim <path/to/config.yaml>```.
16+
DHALSIM can be run using the command ```sudo dhalsim path/to/config.yaml```.
1717

1818
Replacing the text between "< >" with the path to one example topology or your own configuration files. For example, for the anytown example, you'd use:
19-
```sudo dhalsim <examples/anytown_topology/anytown_config.yaml>```
20-
21-
19+
```sudo dhalsim <examples/anytown_topology/anytown_config.yaml>```

dhalsim/command_line.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def run(self):
4747
for yaml_path in yaml_paths:
4848
self.run_simulation(yaml_path)
4949

50-
5150
else:
5251
# Else generate the one we need and run the simulation
5352
intermediate_yaml_path = config_parser.generate_intermediate_yaml()
@@ -66,7 +65,7 @@ def run_simulation(self, intermediate_yaml_path):
6665
db_initializer.print()
6766
automatic_run_path = Path(__file__).parent.absolute() / "python2" / "automatic_run.py"
6867
self.automatic_run = subprocess.Popen(
69-
["python2", str(automatic_run_path), str(intermediate_yaml_path)])
68+
["python3", str(automatic_run_path), str(intermediate_yaml_path)])
7069
self.automatic_run.wait()
7170

7271
def main():

dhalsim/epynet/LICENSE

Lines changed: 0 additions & 25 deletions
This file was deleted.

dhalsim/epynet/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

dhalsim/epynet/__init__.py

Whitespace-only changes.

dhalsim/epynet/epynet/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

dhalsim/epynet/epynet/baseobject.py

Lines changed: 0 additions & 93 deletions
This file was deleted.

dhalsim/epynet/epynet/curve.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)