-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prepare for release 1.3 and output all parameters
- Loading branch information
Showing
6 changed files
with
10 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# Written by Larry Holder ([email protected]). | ||
# | ||
# Copyright (c) 2017-2020. Washington State University. | ||
# Copyright (c) 2017-2021. Washington State University. | ||
|
||
import json | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# Written by Larry Holder ([email protected]). | ||
# | ||
# Copyright (c) 2017-2020. Washington State University. | ||
# Copyright (c) 2017-2021. Washington State University. | ||
# | ||
# This implementation of OrderedSet maintains the set as both an | ||
# actual (unordered) Python set and an ordered list. The main | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# Written by Larry Holder ([email protected]). | ||
# | ||
# Copyright (c) 2017-2020. Washington State University. | ||
# Copyright (c) 2017-2021. Washington State University. | ||
|
||
import os | ||
|
||
|
@@ -88,9 +88,9 @@ def print(self): | |
|
||
def set_defaults_for_graph(self, graph): | ||
if (self.limit == 0): | ||
self.limit = len(graph.edges) / 2 | ||
self.limit = int(len(graph.edges) / 2) | ||
if (self.maxSize == 0): | ||
self.maxSize = len(graph.edges) / 2 | ||
self.maxSize = int(len(graph.edges) / 2) | ||
if (self.iterations == 0): | ||
self.iterations = len(graph.edges) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# Written by Larry Holder ([email protected]). | ||
# | ||
# Copyright (c) 2017-2020. Washington State University. | ||
# Copyright (c) 2017-2021. Washington State University. | ||
|
||
from OrderedSet import OrderedSet # specialized Subdue version | ||
import Graph | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# Written by Larry Holder ([email protected]). | ||
# | ||
# Copyright (c) 2017-2020. Washington State University. | ||
# Copyright (c) 2017-2021. Washington State University. | ||
|
||
import sys | ||
import time | ||
|
@@ -221,13 +221,14 @@ def unwrap_output(iterations): | |
return out | ||
|
||
def main(): | ||
print("SUBDUE v1.2 (python)\n") | ||
print("SUBDUE v1.3 (python)\n") | ||
parameters = Parameters.Parameters() | ||
parameters.set_parameters(sys.argv) | ||
graph = ReadGraph(parameters.inputFileName) | ||
#outputFileName = parameters.outputFileName + ".dot" | ||
#graph.write_to_dot(outputFileName) | ||
parameters.set_defaults_for_graph(graph) | ||
parameters.print() | ||
Subdue(parameters, graph) | ||
|
||
if __name__ == "__main__": | ||
|