From 903a87c6e34cbc7a95b7f9a7f9ef03ef30ea830d Mon Sep 17 00:00:00 2001
From: theos <theo.steininger@ultimanet.de>
Date: Fri, 1 Jul 2016 11:03:57 +0200
Subject: [PATCH] Corrected class names of field types.
---
__init__.py | 8 ++++++--
field_types/__init__.py | 4 ++--
field_types/base_field_type.py | 2 +-
field_types/field_array.py | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/__init__.py b/__init__.py
index 24a7fc997..e4acf586f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -50,11 +50,15 @@ from nifty_paradict import space_paradict,\
point_space_paradict,\
nested_space_paradict
-from field_types import Field_type,\
- Field_array
+from field_types import FieldType,\
+ FieldArray
from operators import *
+from power import PowerSpace,\
+ RGPowerSpace,\
+ LMPowerSpace
+
## optional submodule `rg`
try:
from rg import rg_space,\
diff --git a/field_types/__init__.py b/field_types/__init__.py
index 18d887525..80734f57a 100644
--- a/field_types/__init__.py
+++ b/field_types/__init__.py
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
-from field_array import Field_type,\
- Field_array
\ No newline at end of file
+from field_array import FieldType,\
+ FieldArray
\ No newline at end of file
diff --git a/field_types/base_field_type.py b/field_types/base_field_type.py
index 148f3c9a2..3cd8dbeae 100644
--- a/field_types/base_field_type.py
+++ b/field_types/base_field_type.py
@@ -3,7 +3,7 @@
import numpy as np
-class Field_type(object):
+class FieldType(object):
def __init__(self, shape, dtype):
try:
new_shape = tuple([int(i) for i in shape])
diff --git a/field_types/field_array.py b/field_types/field_array.py
index 952763544..c92f65916 100644
--- a/field_types/field_array.py
+++ b/field_types/field_array.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
-from base_field_type import Field_type
+from base_field_type import FieldType
-class Field_array(Field_type):
+class FieldArray(FieldType):
def dot_contraction(self, x, axes):
return x.sum(axis=axes)
--
GitLab