Skip to content

Commit

Permalink
Removed Type Annotations for RTD Support
Browse files Browse the repository at this point in the history
  • Loading branch information
nick5435 committed Feb 27, 2017
1 parent 1f648af commit bb732a9
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions thermoDataGrabber/thermoDataGrabber/thermoDataGrabber.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,11 @@ def __init__(self,
"""

self.fluid: str
self.fluid = fluid
self.numPoints: Union[List[int], int]
if type(numPoints) is int:
self.numPoints = [numPoints, numPoints]
else:
self.numPoints = [numPoints[0], numPoints[1]]
self.colorMap: str
self.xvar: str
self.yvar: str
self.zvar: str
self.M: float
self.meta: pyr._pmap.PMap
self.colorMap = colorMap
self.xvar = var1
self.yvar = var2
Expand Down Expand Up @@ -161,15 +153,13 @@ def __init__(self,
])

# Create Pandas Frame of Data
self.data: pd.DataFrame
self.data = pd.DataFrame(np.asarray(data), columns=self.vars)
self.make_units()
self.clean()
self.make_meta()

def make_units(self)-> None:
"""(Re)make the units list"""
self.units: List[Text]
self.units = [get(var, UNITS, "UnknownVar") for var in self.vars]

def make_meta(self) -> None:
Expand Down Expand Up @@ -312,16 +302,7 @@ def __init__(self, pathToFile: str) -> None:
pathToFile (str): The name of the files you want to use, NOT the path. Must have both a json and a CSV file for this purpose.
"""
self.meta: pyr._pmap.PMap
self.data: pd.DataFrame
self.fluid: str
self.numPoints: Union[List[int], int]
self.colorMap: str
self.xvar: str
self.yvar: str
self.zvar: str
self.M: float
self.vars: List[Text]

with open(pathToFile + ".json", mode="r+") as jf:
self.meta = pyr.pmap(json.loads(jf.read()))
with open(pathToFile + ".csv", mode="r+") as cf:
Expand Down

0 comments on commit bb732a9

Please sign in to comment.