From 6fc580c7c978f361a6a4414bd89aebaae914e6e3 Mon Sep 17 00:00:00 2001 From: Larry Holder Date: Wed, 20 Jan 2021 11:00:38 -0800 Subject: [PATCH] Prepare for release 1.3 and output all parameters --- LICENSE | 2 +- src/Graph.py | 2 +- src/OrderedSet.py | 2 +- src/Parameters.py | 6 +++--- src/Pattern.py | 2 +- src/Subdue.py | 5 +++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index c5698a8..97e6490 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/src/Graph.py b/src/Graph.py index dc2a5fb..bba4792 100644 --- a/src/Graph.py +++ b/src/Graph.py @@ -2,7 +2,7 @@ # # Written by Larry Holder (holder@wsu.edu). # -# Copyright (c) 2017-2020. Washington State University. +# Copyright (c) 2017-2021. Washington State University. import json diff --git a/src/OrderedSet.py b/src/OrderedSet.py index 1fbfc78..f19e8c3 100644 --- a/src/OrderedSet.py +++ b/src/OrderedSet.py @@ -2,7 +2,7 @@ # # Written by Larry Holder (holder@wsu.edu). # -# 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 diff --git a/src/Parameters.py b/src/Parameters.py index 5c2f222..ce982e6 100644 --- a/src/Parameters.py +++ b/src/Parameters.py @@ -2,7 +2,7 @@ # # Written by Larry Holder (holder@wsu.edu). # -# 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) diff --git a/src/Pattern.py b/src/Pattern.py index 58598d4..4698481 100644 --- a/src/Pattern.py +++ b/src/Pattern.py @@ -2,7 +2,7 @@ # # Written by Larry Holder (holder@wsu.edu). # -# Copyright (c) 2017-2020. Washington State University. +# Copyright (c) 2017-2021. Washington State University. from OrderedSet import OrderedSet # specialized Subdue version import Graph diff --git a/src/Subdue.py b/src/Subdue.py index ba1b29e..0a40dc4 100644 --- a/src/Subdue.py +++ b/src/Subdue.py @@ -2,7 +2,7 @@ # # Written by Larry Holder (holder@wsu.edu). # -# 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__":