Skip to content

Commit

Permalink
Merge pull request #149 from eendebakpt/dev
Browse files Browse the repository at this point in the history 
New release: version for zenodo
  • Loading branch information
@eendebakpt
eendebakpt authored Feb 27, 2019
2 parents 1cfe9b9 + 4e8bcbc commit d10cbf7
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 120 deletions.
180 changes: 85 additions & 95 deletions docs/examples/example_designs.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,76 +11,83 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"The package contains several example arrays and designs."
"The package contains several example arrays and designs. They can be retrieved using the method `exampleArray`."
]
},
{
"cell_type": "code",
"execution_count": 8,
"metadata": {
"collapsed": false
},
"execution_count": 4,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"index 0: exampleArray: array in OA(8,2, 2^2)\n",
"index 1: exampleArray: array 3 in OA(16, 2, 2^5)\n",
"index 2: exampleArray: array 6 in OA(16, 2, 2^6)\n",
"index 3: exampleArray: array ? in OA(32, 3, 2^7)\n",
"index 4: exampleArray: array 4 in OA(16, 2, 2^7)\n",
"index 5: exampleArray: array 0 in OA(24, 2, 4 3 2^a)\n",
"index 6: exampleArray: array in OA(4, 2, 2^a)\n",
"index 7: exampleArray: array 0 in OA(4, 2, 2^a)?\n",
"index 8: exampleArray: array in OA(40, 3, 2^7)\n",
"index 9: exampleArray: array in OA(40, 2^7), D-optimal\n",
"index 10: exampleArray: array in OA(9, 3^2)\n",
"index 11: exampleArray: D-optimal array in OA(44, 2^8)\n",
"index 12: exampleArray: even-odd array OA(64, 2^13)\n",
"index 13: exampleArray: array in OA(25, 2^5)\n",
"index 14: exampleArray: design in D(28, 2^5), D-efficiency is low\n",
"index 15: exampleArray: design in D(56, 2^10), D-efficiency is low\n",
"index 16: exampleArray: array in OA(32, 2, 2^5)\n",
"index 17: exampleArray: unique array in OA(64, 4, 2^7)\n",
"index 18: exampleArray: conference matrix of size 16, 7\n",
"index 19: exampleArray: conference matrix of size 4, 3\n",
"index 20: exampleArray: first LMC-0 double conference matrix in DC(24,3)\n",
"index 21: exampleArray: second LMC-0 double conference matrix in DC(16,4)\n",
"index 22: exampleArray: LMC-0 double conference matrix in DC(32,4)\n",
"index 23: exampleArray: LMC-0 double conference matrix in DC(32,6)\n",
"index 24: exampleArray: design in OA(64, 3, 2^16) (even-odd)\n",
"index 25: exampleArray: design in OA(64, 3, 2^16) (even-odd)\n",
"index 26: exampleArray: design in OA(64, 3, 2^16) (even-odd)\n",
"index 27: exampleArray: design in OA(64, 3, 2^16) (even-odd)\n",
"index 28: exampleArray: conference design in C(4, 3) in LMC0 form\n",
"index 29: exampleArray: conference design in C(4, 3)\n",
"index 30: exampleArray: conference design in C(8,4)\n",
"index 31: exampleArray: conference design in C(8,4)\n",
"index 32: exampleArray: first double conference design in DC(18,4)\n",
"index 33: exampleArray: second double conference design in DC(18,4)\n",
"index 34: exampleArray: third double conference design in DC(18,4)\n",
"index 35: exampleArray: first double conference design in DC(20,4)\n",
"index 36: exampleArray: second double conference design in DC(20,4)\n",
"index 37: exampleArray: third double conference design in DC(20,4)\n",
"index 38: exampleArray: LMC0 conference design in C(30,3)\n",
"index 39: exampleArray: first LMC0 conference design in C(8,6)\n",
"index 40: exampleArray: first conference design in C(14, 5)\n",
"index 41: exampleArray: second conference design in C(14, 5)\n",
"index 42: exampleArray: third conference design in C(14, 5)\n",
"index 43: exampleArray: no such index 43\n"
"exampleArray 0: array in OA(8,2, 2^2)\n",
"exampleArray 1: array 3 in OA(16, 2, 2^5)\n",
"exampleArray 2: array 6 in OA(16, 2, 2^6)\n",
"exampleArray 3: array ? in OA(32, 3, 2^7)\n",
"exampleArray 4: array 4 in OA(16, 2, 2^7)\n",
"exampleArray 5: array 0 in OA(24, 2, 4 3 2^a)\n",
"exampleArray 6: array in OA(4, 2, 2^a)\n",
"exampleArray 7: array 0 in OA(4, 2, 2^a)?\n",
"exampleArray 8: array in OA(40, 3, 2^7)\n",
"exampleArray 9: array in A(40, 2^7), D-optimal\n",
"exampleArray 10: array in OA(9, 3^3)\n",
"exampleArray 11: D-optimal array in OA(44, 2^8)\n",
"exampleArray 12: even-odd array OA(64, 2^13)\n",
"exampleArray 13: array in OA(25, 2^5)\n",
"exampleArray 14: design in D(28, 2^5), D-efficiency is low\n",
"exampleArray 15: design in D(56, 2^10), D-efficiency is low\n",
"exampleArray 16: array in OA(32, 2, 2^5)\n",
"exampleArray 17: unique array in OA(64, 4, 2^7)\n",
"exampleArray 18: conference matrix of size 16, 7\n",
"exampleArray 19: conference matrix of size 4, 3\n",
"exampleArray 20: first LMC-0 double conference matrix in DC(24,3)\n",
"exampleArray 21: second LMC-0 double conference matrix in DC(16,4)\n",
"exampleArray 22: LMC-0 double conference matrix in DC(32,4)\n",
"exampleArray 23: LMC-0 double conference matrix in DC(32,6)\n",
"exampleArray 24: design in OA(64, 3, 2^16) (even-odd)\n",
"exampleArray 25: design in OA(64, 3, 2^16) (even-odd)\n",
"exampleArray 26: design in OA(64, 3, 2^16) (even-odd)\n",
"exampleArray 27: design in OA(64, 3, 2^16) (even-odd)\n",
"exampleArray 28: conference design in C(4, 3) in LMC0 form\n",
"exampleArray 29: conference design in C(4, 3)\n",
"exampleArray 30: conference design in C(8,4)\n",
"exampleArray 31: conference design in C(8,4)\n",
"exampleArray 32: first double conference design in DC(18,4)\n",
"exampleArray 33: second double conference design in DC(18,4)\n",
"exampleArray 34: third double conference design in DC(18,4)\n",
"exampleArray 35: first double conference design in DC(20,4)\n",
"exampleArray 36: second double conference design in DC(20,4)\n",
"exampleArray 37: third double conference design in DC(20,4)\n",
"exampleArray 38: LMC0 conference design in C(30,3)\n",
"exampleArray 39: first LMC0 conference design in C(8,6)\n",
"exampleArray 40: first conference design in C(14, 5)\n",
"exampleArray 41: second conference design in C(14, 5)\n",
"exampleArray 42: third conference design in C(14, 5)\n",
"exampleArray 43: 2x2 array with zeros and a singe value -1\n",
"exampleArray 44: D-optimal strength 3 ortogonal array in OA(40,3, 2^7)\n",
"exampleArray 45: first conference design in C(20,8)\n",
"exampleArray 46: second conference design in C(20,8)\n",
"exampleArray 47: third conference design in C(20,8)\n",
"exampleArray 48: last conference design in C(20,8)\n",
"exampleArray 49: array 4347 C(20,8)\n",
"exampleArray 50: array 4506 C(20,8)\n",
"exampleArray 51: first array in C(12,4)\n",
"exampleArray 52: second array in C(12,4)\n",
"exampleArray 53: third array in C(12,4)\n",
"exampleArray 54: root array in OA(6,2,3^1 2^1)\n",
"exampleArray: no example array with index 55 exists\n"
]
}
],
"source": [
"import oapackage\n",
"for ii in range(50):\n",
" print('index %d: ' % ii, end='')\n",
" al = oapackage.exampleArray(ii, 1)\n",
" if al.n_columns==0:\n",
" break"
"al = oapackage.exampleArray(-1, 1)"
]
},{
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
Expand All @@ -89,53 +96,36 @@
},
{
"cell_type": "code",
"execution_count": 9,
"metadata": {
"collapsed": false
},
"execution_count": 3,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"array: \n",
" 0 0 0 0 0\n",
" 0 0 0 0 0\n",
" 0 0 0 0 1\n",
" 0 0 0 1 0\n",
" 0 0 0 1 1\n",
" 0 0 1 0 0\n",
" 0 0 1 0 1\n",
" 0 0 1 1 0\n",
" 0 1 0 0 1\n",
" 0 1 0 1 0\n",
" 0 1 0 1 1\n",
" 0 1 1 0 0\n",
" 0 1 1 0 1\n",
" 0 1 1 1 0\n",
" 0 1 1 1 1\n",
" 0 1 1 1 1\n",
" 1 0 0 0 1\n",
" 1 0 0 1 0\n",
" 1 0 0 1 1\n",
" 1 0 1 0 0\n",
" 1 0 1 0 1\n",
" 1 0 1 1 0\n",
" 1 0 1 1 1\n",
" 1 0 1 1 1\n",
" 1 1 0 0 0\n",
" 1 1 0 0 0\n",
" 1 1 0 0 1\n",
" 1 1 0 1 0\n",
" 1 1 0 1 1\n",
" 1 1 1 0 0\n",
" 1 1 1 0 1\n",
" 1 1 1 1 0\n"
"exampleArray 2: array 6 in OA(16, 2, 2^6)\n",
"array:\n",
" 0 0 0 0 0 0\n",
" 0 0 0 0 0 0\n",
" 0 0 0 1 1 1\n",
" 0 0 0 1 1 1\n",
" 0 1 1 0 0 1\n",
" 0 1 1 0 1 0\n",
" 0 1 1 1 0 1\n",
" 0 1 1 1 1 0\n",
" 1 0 1 0 0 1\n",
" 1 0 1 0 1 1\n",
" 1 0 1 1 0 0\n",
" 1 0 1 1 1 0\n",
" 1 1 0 0 1 0\n",
" 1 1 0 0 1 1\n",
" 1 1 0 1 0 0\n",
" 1 1 0 1 0 1\n"
]
}
],
"source": [
"al=oapackage.exampleArray(16)\n",
"al=oapackage.exampleArray(2, 1)\n",
"al.showarray()"
]
}
Expand All @@ -156,9 +146,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.2"
"version": "3.7.1"
}
},
"nbformat": 4,
"nbformat_minor": 0
"nbformat_minor": 1
}
25 changes: 15 additions & 10 deletions docs/examples/example_oa_files.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -33,7 +33,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 2,
"metadata": {},
"outputs": [
{
Expand All @@ -58,7 +58,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -75,14 +75,14 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 4,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"file C:\\Users\\EENDEB~1\\AppData\\Local\\Temp\\tmp9rr1ma4h.oa: 18 rows, 4 columns, 2 arrays, mode text, nbits 0\n"
"file C:\\Users\\EENDEB~1\\AppData\\Local\\Temp\\tmpxc4dnsl6.oa: 18 rows, 4 columns, 2 arrays, mode text, nbits 0\n"
]
}
],
Expand All @@ -99,7 +99,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand All @@ -115,16 +115,22 @@
"print(lst2)"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"The first array in the list that was read from disk is:"
]
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 7,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"The first array is:\n",
"array:\n",
" 0 0 0 0\n",
" 0 0 0 0\n",
Expand All @@ -148,7 +154,6 @@
}
],
"source": [
"print('The first array is:')\n",
"lst2[0].showarray()"
]
}
Expand All @@ -169,7 +174,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.3"
"version": "3.7.1"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit d10cbf7

Please sign in to comment.