WIP: changes layout of exercise

miykael · miykael · commit 7fd52c70ebd2 · 2017-12-04T13:02:36.000+01:00
diff --git a/notebooks/basic_iteration.ipynb b/notebooks/basic_iteration.ipynb
@@ -253,10 +253,7 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {
-    "solution2": "hidden",
-    "solution2_first": true
-   },
+   "metadata": {},
    "source": [
     "#### Exercise 1\n",
     "Create a workflow to calculate a various powers of ``2`` using  two nodes, one for ``IdentityInterface`` with ``iterables``, and one for ``Function`` interface to calculate power of ``2``."
@@ -266,61 +263,10 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "solution2": "hidden"
-   },
-   "outputs": [],
-   "source": [
-    "# lets start from the Identity node\n",
-    "from nipype import Function, Node, Workflow\n",
-    "from nipype.interfaces.utility import IdentityInterface\n",
-    "\n",
-    "iden = Node(IdentityInterface(fields=['number']), name=\"identity\")                                                                                                                                 \n",
-    "iden.iterables = [(\"number\", range(8))]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "solution2": "hidden"
-   },
-   "outputs": [],
-   "source": [
-    "# the second node should use the Function interface\n",
-    "\n",
-    "def power_of_two(n):\n",
-    "    return 2**n\n",
-    "\n",
-    "# Create Node\n",
-    "power = Node(Function(input_names=[\"n\"],\n",
-    "                      output_names=[\"pow\"],\n",
-    "                      function=power_of_two),\n",
-    "              name='power')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "solution2": "hidden"
+    "solution2": "hidden",
+    "solution2_first": true
    },
    "outputs": [],
-   "source": [
-    "#and now the workflow\n",
-    "wf_ex1 = Workflow(name=\"exercise1\")\n",
-    "wf_ex1.connect(iden, \"number\", power, \"n\")\n",
-    "res_ex1 = wf_ex1.run()\n",
-    "\n",
-    "# we can print the results\n",
-    "for i in range(8):\n",
-    "    print(list(res_ex1.nodes())[i].result.outputs)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
    "source": [
     "# write your solution here"
    ]
@@ -333,11 +279,11 @@
    },
    "outputs": [],
    "source": [
-    "# lets start from theIdentity node\n",
+    "# lets start from the Identity node\n",
     "from nipype import Function, Node, Workflow\n",
     "from nipype.interfaces.utility import IdentityInterface\n",
     "\n",
-    "iden = Node(IdentityInterface(fields=['number']), name=\"identity\")                                                                                                                                 \n",
+    "iden = Node(IdentityInterface(fields=['number']), name=\"identity\")\n",
     "iden.iterables = [(\"number\", range(8))]"
    ]
   },
@@ -350,61 +296,6 @@
    "outputs": [],
    "source": [
     "# the second node should use the Function interface\n",
-    "\n",
-    "def power_of_two(n):\n",
-    "    return 2**n\n",
-    "\n",
-    "# Create Node\n",
-    "power = Node(Function(input_names=[\"n\"],\n",
-    "                      output_names=[\"pow\"],\n",
-    "                      function=power_of_two),\n",
-    "              name='power')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "solution2": "hidden"
-   },
-   "outputs": [],
-   "source": [
-    "# lets start from theIdentity node\n",
-    "from nipype import Function, Node, Workflow\n",
-    "from nipype.interfaces.utility import IdentityInterface\n",
-    "\n",
-    "iden = Node(IdentityInterface(fields=['number']), name=\"identity\")                                                                                                                                 \n",
-    "iden.iterables = [(\"number\", range(8))]\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "solution2": "hidden"
-   },
-   "outputs": [],
-   "source": [
-    "#and now the workflow\n",
-    "wf_ex1 = Workflow(name=\"exercise1\")\n",
-    "wf_ex1.connect(iden, \"number\", power, \"n\")\n",
-    "res_ex1 = wf_ex1.run()\n",
-    "\n",
-    "# we can print the results\n",
-    "for i in range(8):\n",
-    "    print(list(res_ex1.nodes())[i].result.outputs)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "solution2": "hidden"
-   },
-   "outputs": [],
-   "source": [
-    "# the second node should use the Function interface\n",
-    "\n",
     "def power_of_two(n):\n",
     "    return 2**n\n",
     "\n",
