Commit 23bb2ee0 authored by Russell Luke's avatar Russell Luke
Browse files

File IO is DONE (except for the legacy bugs)

parent c0c9352b
......@@ -2,6 +2,6 @@ import pdb
import SetProxPythonPath
from proxtoolbox.experiments.phase.Elser_Experiment import Elser_Experiment
Elser = Elser_Experiment(Atoms=200, category='E', algorithm='RRR', lambda_0=0.95, lambda_max=0.95, anim=True)
Elser = Elser_Experiment(Atoms=400, category='H', algorithm='RRR', lambda_0=0.95, lambda_max=0.95, anim=True)
......@@ -13,6 +13,7 @@ from proxtoolbox.utils.cell import Cell, isCell
#for downloading data
import proxtoolbox.utils.GetData as GetData
from proxtoolbox.utils.GetData import datadir
import matplotlib
import matplotlib.pyplot as plt
......@@ -84,7 +85,7 @@ class Elser_Experiment(PhaseExperiment):
snr = 1e-8
print('Loading data.')
fn="".join(['../InputData/Phase/Elser/data', str(self.Atoms), self.category])
fn="".join([str(datadir/"Elser"/"data"), str(self.Atoms), self.category])
# read text data file as a matrix of numbers
data = np.loadtxt(fn, delimiter="\t")
data = np.sqrt(data)/self.Nx
......@@ -7,8 +7,6 @@ import shutil
datadir = Path(__file__).parent.parent.parent.parent / 'InputData'
datadir = Path(__file__).parent.parent.parent.parent / 'InputData'
#shows progress of download
def dlProgress(counter, blocksize, size):
p = counter*blocksize*100.0/size
  • With the deletions of only the CDP data, the automatic downloader fails to recognize that the data is missing, since the other phase data is still there. I will update this automation to a more refined one soon.

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment