diff options
| author | Dan Gudmundsson <[email protected]> | 2017-09-18 11:24:52 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-09-18 11:24:52 +0200 |
| commit | f4a7f8a1f617e46653267bb18b9f7f635437d6d1 (patch) | |
| tree | 7ec7d1d25435522c4c1cd3448f54280b29522174 /lib/wx/examples/sudoku | |
| parent | decbaba3a095cfc004a747edbd338f918d6bb0fe (diff) | |
| parent | d776b9be154d87a41df240c2adc1803a89e3df1f (diff) | |
| download | otp-f4a7f8a1f617e46653267bb18b9f7f635437d6d1.tar.gz otp-f4a7f8a1f617e46653267bb18b9f7f635437d6d1.tar.bz2 otp-f4a7f8a1f617e46653267bb18b9f7f635437d6d1.zip | |
Merge branch 'dgud/wx/decrease-opengl-docs' into maint
* dgud/wx/decrease-opengl-docs:
reltool: Remove export_all warning in tests
et: Remove export_all warnings in test
mnesia: Remove export_all in tests
wx: Remove export_all in example code
wx: test remove export_all
wx: Update doc, OpenGL external links
wx: Reduce Opengl docs
Diffstat (limited to 'lib/wx/examples/sudoku')
| -rw-r--r-- | lib/wx/examples/sudoku/sudoku.erl | 3 | ||||
| -rw-r--r-- | lib/wx/examples/sudoku/sudoku_game.erl | 23 | ||||
| -rw-r--r-- | lib/wx/examples/sudoku/sudoku_gui.erl | 2 |
3 files changed, 5 insertions, 23 deletions
diff --git a/lib/wx/examples/sudoku/sudoku.erl b/lib/wx/examples/sudoku/sudoku.erl index 97f35870de..353f90d86f 100644 --- a/lib/wx/examples/sudoku/sudoku.erl +++ b/lib/wx/examples/sudoku/sudoku.erl @@ -26,9 +26,8 @@ -module(sudoku). --export([go/0]). +-export([go/0, start/0]). --compile(export_all). -include("sudoku.hrl"). diff --git a/lib/wx/examples/sudoku/sudoku_game.erl b/lib/wx/examples/sudoku/sudoku_game.erl index 1e579a7c88..aa15c05653 100644 --- a/lib/wx/examples/sudoku/sudoku_game.erl +++ b/lib/wx/examples/sudoku/sudoku_game.erl @@ -18,7 +18,9 @@ %% %CopyrightEnd% -module(sudoku_game). --compile(export_all). + +-export([init/1, + indx/1, rcm/1, level/1]). -include("sudoku.hrl"). init(GFX) -> @@ -128,17 +130,6 @@ rebuild_all(_, S0) -> add(rcm(Indx),Val,Acc) end, S1, Solved). -is_ok({RI,CI,MI}, Vals) -> - [Ri,Ci,Mi] = all(RI,CI,MI), - case element(indx(RI,CI),Vals) of - 0 -> true; - Val -> - Vs = [[element(indx(R,C),Vals)||{R,C} <- Obs, - not ((R == RI) and (C == CI))] - || Obs <- [Ri,Ci,Mi]], - not lists:member(Val,lists:flatten(Vs)) - end. - test() -> %% Known to solvable [{{1,2},6}, {{1,4},1}, {{1,6},4}, {{1,8},5}, {{2,3},8}, {{2,4},3}, {{2,6},5}, {{2,7},6}, @@ -377,14 +368,6 @@ get_poss([H|R],What,Tot) -> %% io:format("~p~n",[H]), get_poss(R,What, gb_sets:union(element(H,What),Tot)). -r2rs(R) -> - R0 = (R-1)*3, - [R0+1,R0+2,R0+3]. - -c2cs(C) -> - C0 = (C-1) rem 9, - [C0+1, C0+10, C0+19]. - mindx(row,Indx) -> {R,_C,M} = rcm(Indx), mindx(R,M); diff --git a/lib/wx/examples/sudoku/sudoku_gui.erl b/lib/wx/examples/sudoku/sudoku_gui.erl index 81d20814e1..4c4ad83cd7 100644 --- a/lib/wx/examples/sudoku/sudoku_gui.erl +++ b/lib/wx/examples/sudoku/sudoku_gui.erl @@ -28,7 +28,7 @@ -export([init/1, handle_info/2, handle_call/3, handle_cast/2, handle_event/2, terminate/2, code_change/3]). --compile(export_all). +-export([new/1]). -behaviour(wx_object). |