From e1f794d7b7a3fdb228a5ff9a6f193aba657d86d1 Mon Sep 17 00:00:00 2001 From: SimpleArt <71458112+SimpleArt@users.noreply.github.com> Date: Sat, 7 Nov 2020 17:17:18 -0500 Subject: [PATCH] Database files renamed --- src/EasyGA.py | 4 ++-- src/attributes.py | 8 ++++---- src/database/{graph.py => matplotlib_graph.py} | 5 +---- src/database/{database.py => sql_database.py} | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) rename src/database/{graph.py => matplotlib_graph.py} (96%) rename src/database/{database.py => sql_database.py} (98%) diff --git a/src/EasyGA.py b/src/EasyGA.py index b7448f5..72d331f 100644 --- a/src/EasyGA.py +++ b/src/EasyGA.py @@ -20,11 +20,11 @@ from crossover import Crossover_Methods from attributes import Attributes # Database class -from database import database +from database import sql_database from sqlite3 import Error # Graphing package -from database import graph +from database import matplotlib_graph import matplotlib.pyplot as plt diff --git a/src/attributes.py b/src/attributes.py index 4f27d13..c934468 100644 --- a/src/attributes.py +++ b/src/attributes.py @@ -21,11 +21,11 @@ from mutation import Mutation_Methods from crossover import Crossover_Methods # Database class -from database import database +from database import sql_database from sqlite3 import Error # Graphing package -from database import graph +from database import matplotlib_graph import matplotlib.pyplot as plt @@ -63,7 +63,7 @@ class Attributes: mutation_individual_impl = Mutation_Methods.Individual.single_gene, mutation_population_impl = Mutation_Methods.Population.random_selection, termination_impl = Termination_Methods.fitness_and_generation_based, - Database = database.Database, + Database = sql_database.SQL_Database, database_name = 'database.db', sql_create_data_structure = """CREATE TABLE IF NOT EXISTS data ( id integer PRIMARY KEY, @@ -71,7 +71,7 @@ class Attributes: fitness DOUBLE, chromosome text ); """, - Graph = graph.Graph + Graph = matplotlib_graph.Matplotlib_Graph ): # Initilization variables diff --git a/src/database/graph.py b/src/database/matplotlib_graph.py similarity index 96% rename from src/database/graph.py rename to src/database/matplotlib_graph.py index fe5917a..e446dc5 100644 --- a/src/database/graph.py +++ b/src/database/matplotlib_graph.py @@ -1,10 +1,7 @@ # Graphing package import matplotlib.pyplot as plt -# Database class -from database import database -from sqlite3 import Error -class Graph: +class Matplotlib_Graph: """Prebuilt graphing functions to make visual represention of fitness data.""" diff --git a/src/database/database.py b/src/database/sql_database.py similarity index 98% rename from src/database/database.py rename to src/database/sql_database.py index 232ae32..968bb80 100644 --- a/src/database/database.py +++ b/src/database/sql_database.py @@ -3,9 +3,9 @@ from sqlite3 import Error import os -class Database: +class SQL_Database: """Main database class that controls all the functionality for input / - out of the database.""" + out of the database using SQLite3.""" def __init__(self):