Skip to content

Commit

Permalink
Prepare for release 1.3 and output all parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
holderlb committed Jan 20, 2021
1 parent d2e8496 commit 6fc580c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017-2020 Larry Holder, Washington State University.
Copyright (c) 2017-2021 Larry Holder, Washington State University.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion src/Graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/OrderedSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/Pattern.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/Subdue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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__":
Expand Down

0 comments on commit 6fc580c

Please sign in to comment.