renamed datautils -> datautil

sunyucheng · Jul 3, 2017 · 7e6cf64 · 7e6cf64
1 parent dd4ca21
commit 7e6cf64
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/braindecode/datautils/__init__.py → braindecode/datautil/__init__.py b/braindecode/datautils/__init__.py → braindecode/datautil/__init__.py
diff --git a/braindecode/datautils/iterators.py → braindecode/datautil/iterators.py b/braindecode/datautils/iterators.py → braindecode/datautil/iterators.py
diff --git a/braindecode/datautils/signal_target.py → braindecode/datautil/signal_target.py b/braindecode/datautils/signal_target.py → braindecode/datautil/signal_target.py
diff --git a/braindecode/datautils/splitters.py → braindecode/datautil/splitters.py b/braindecode/datautils/splitters.py → braindecode/datautil/splitters.py
diff --git a/braindecode/experiments/experiment.py b/braindecode/experiments/experiment.py
@@ -5,7 +5,7 @@
 
 import pandas as pd
 
-from braindecode.datautils.splitters import concatenate_sets
+from braindecode.datautil.splitters import concatenate_sets
 from braindecode.experiments.stopcriteria import MaxEpochs, ColumnBelow, Or
 from braindecode.torchext.util import np_to_var, set_random_seeds
 

diff --git a/braindecode/experiments/monitors.py b/braindecode/experiments/monitors.py
@@ -1,8 +1,6 @@
 import numpy as np
 import time
 
-from braindecode.trial_segment import compute_trial_start_stop_samples
-
 
 class MisclassMonitor(object):
     def __init__(self, exponentiate_preds=False, col_suffix='misclass'):
@@ -139,4 +137,4 @@ def monitor_epoch(self,):
 
     def monitor_set(self, setname, all_preds, all_losses,
                     all_batch_sizes, all_targets, dataset):
-        return {}
+        return {}
diff --git a/docs/notebooks/TrialWise_Decoding.ipynb b/docs/notebooks/TrialWise_Decoding.ipynb
@@ -14,7 +14,7 @@
     "%load_ext autoreload\n",
     "%autoreload 2\n",
     "import os\n",
-    "os.sys.path.insert(0, '/home/schirrmr/braindecode/code/braindecode2/')"
+    "os.sys.path.insert(0, '/home/schirrmr/braindecode/code/braindecode/')"
    ]
   },
   {
@@ -136,7 +136,7 @@
     "editable": true
    },
    "source": [
-    "Braindecode has a minimalistic ```SignalAndTarget``` class, with attributes `X` for the signal and `y` for the labels. For trialwise decoding, X should have these dimensions: trials x channels x timesteps."
+    "Braindecode has a minimalistic ```SignalAndTarget``` class, with attributes `X` for the signal and `y` for the labels. `X` should have these dimensions: trials x channels x timesteps."
    ]
   },
   {
@@ -176,7 +176,7 @@
    },
    "outputs": [],
    "source": [
-    "from braindecode.datautils.signal_target import SignalAndTarget\n",
+    "from braindecode.datautil.signal_target import SignalAndTarget\n",
     "from braindecode.torchext.util import set_random_seeds\n",
     "\n",
     "train_set = SignalAndTarget(X[:60], y=y[:60])\n",
@@ -446,7 +446,7 @@
    ],
    "source": [
     "from braindecode.torchext.util import np_to_var, var_to_np\n",
-    "from braindecode.datautils.iterators import get_balanced_batches\n",
+    "from braindecode.datautil.iterators import get_balanced_batches\n",
     "import torch.nn.functional as F\n",
     "from numpy.random import RandomState\n",
     "rng = RandomState((2017,6,30))\n",
@@ -531,7 +531,6 @@
   }
  ],
  "metadata": {
-  "celltoolbar": "Edit Metadata",
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",