diff --git a/__init__.py b/__init__.py index 24a7fc9974fcf82f2fa055bfb29411e956eaa295..e4acf586f220c559e8e30401a7c5613c01ac3fa3 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 18d88752560b68751c08cacddc2118d2b35ce822..80734f57ad9078da5b5e11ee92eb8a6249d8107f 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 148f3c9a2bc3110f11314e9bad49f32a2eafe660..3cd8dbeaebc1187291bb25cde9ac8a494aef7628 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 952763544eeef1418dc74a763ae1db7cd1827f1e..c92f65916f66e86342b7dbe58eaf15200c3fcd65 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)