From 469ddb3d62dfa5d4399c5098bbbba131f2856104 Mon Sep 17 00:00:00 2001 From: oscarsjogren Date: Thu, 25 May 2017 23:45:02 +0200 Subject: [PATCH] new structure --- ezclimate/__init__.py | 20 ++++++++++---------- ezclimate/analysis.py | 6 +++--- ezclimate/optimization.py | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ezclimate/__init__.py b/ezclimate/__init__.py index 6ba9205..18b2b76 100644 --- a/ezclimate/__init__.py +++ b/ezclimate/__init__.py @@ -10,14 +10,14 @@ if missing_dependencies: raise ImportError("Missing required dependencies {0}".format(missing_dependencies)) -from ezclimate.optimization import * -from ezclimate.analysis import * -from ezclimate.bau import * -from ezclimate.cost import * -from ezclimate.damage import * -from ezclimate.damage_simulation import * -from ezclimate.forcing import * -from ezclimate.storage_tree import * -from ezclimate.tree import * -from ezclimate.utility import * +from optimization import * +from analysis import * +from bau import * +from cost import * +from damage import * +from damage_simulation import * +from forcing import * +from storage_tree import * +from tree import * +from utility import * diff --git a/ezclimate/analysis.py b/ezclimate/analysis.py index 6221e99..c312ff9 100644 --- a/ezclimate/analysis.py +++ b/ezclimate/analysis.py @@ -1,9 +1,9 @@ from __future__ import division, print_function import numpy as np from scipy.optimize import brentq -from ezclimate.storage_tree import BigStorageTree, SmallStorageTree -from ezclimate.optimization import GeneticAlgorithm, GradientSearch -from ezclimate.tools import write_columns_csv, append_to_existing, import_csv +from storage_tree import BigStorageTree, SmallStorageTree +from optimization import GeneticAlgorithm, GradientSearch +from tools import write_columns_csv, append_to_existing, import_csv def additional_ghg_emission(m, utility): diff --git a/ezclimate/optimization.py b/ezclimate/optimization.py index fd5c0c4..255f831 100644 --- a/ezclimate/optimization.py +++ b/ezclimate/optimization.py @@ -1,7 +1,7 @@ from __future__ import division, print_function import numpy as np import multiprocessing -from ezclimate.tools import _pickle_method, _unpickle_method +from tools import _pickle_method, _unpickle_method try: import copy_reg except: