Mercurial > dive4elements > river
comparison gwt-client/src/test/java/test/bundu/BunduBezugswstRunner.java @ 9442:173f188569c6
little improvements
author | gernotbelger |
---|---|
date | Mon, 20 Aug 2018 18:20:15 +0200 |
parents | ce0a48b93f4b |
children | 86e522bc7f36 |
comparison
equal
deleted
inserted
replaced
9441:e75afd693f78 | 9442:173f188569c6 |
---|---|
39 private final String sounding; | 39 private final String sounding; |
40 | 40 |
41 private final String calcChoice; | 41 private final String calcChoice; |
42 private final double step; | 42 private final double step; |
43 private final List<Segment> segments; | 43 private final List<Segment> segments; |
44 private final int qSectorStart; | 44 private final String qSectorStart; |
45 private final int qSectorEnd; | 45 private final String qSectorEnd; |
46 private final int[] events; | 46 private final int[] events; |
47 private final String function; | |
47 | 48 |
48 public BunduBezugswstRunner(final IFilenameMapper file, final double from, final double to, final double step, final River river, final int bezugsjahr, | 49 public BunduBezugswstRunner(final IFilenameMapper file, final double from, final double to, final double step, final River river, final int bezugsjahr, |
49 final String fixationChoice, final int gaugeRangeQsectorStart_q1, final int gaugeRangeQsectorEnd_q2, final int[] events, final int years_length, | 50 final String fixationChoice, final String function, final String abflussklasseFrom, final String abflussklasseTo, final int[] events, |
50 final List<Segment> segments, final String calcChoice, final boolean fehlvolumina, final String sounding) | 51 final int years_length, final List<Segment> segments, final String calcChoice, final boolean fehlvolumina, final String sounding) |
51 throws ConnectionException, ServerException { | 52 throws ConnectionException, ServerException { |
52 super(AbstractModuleRunner.Infotype.bundu, test.bundu.BunduBerechnungsartenTester.CalcMode.bundu_bezugswst, file, from, to, river); | 53 super(AbstractModuleRunner.Infotype.bundu, test.bundu.BunduBerechnungsartenTester.CalcMode.bundu_bezugswst, file, from, to, river); |
53 this.fixationChoice = fixationChoice; | 54 this.fixationChoice = fixationChoice; |
54 this.qSectorStart = gaugeRangeQsectorStart_q1; | 55 this.qSectorStart = abflussklasseFrom; |
55 this.qSectorEnd = gaugeRangeQsectorEnd_q2; | 56 this.qSectorEnd = abflussklasseTo; |
56 this.bezugsjahr = bezugsjahr; | 57 this.bezugsjahr = bezugsjahr; |
57 this.years_length = years_length; | 58 this.years_length = years_length; |
58 this.fehlvolumina = fehlvolumina; | 59 this.fehlvolumina = fehlvolumina; |
59 this.sounding = sounding; | 60 this.sounding = sounding; |
60 this.calcChoice = calcChoice; | 61 this.calcChoice = calcChoice; |
61 this.step = step; | 62 this.step = step; |
62 this.segments = segments; | 63 this.segments = segments; |
63 this.events = events; | 64 this.events = events; |
65 this.function = function; | |
64 } | 66 } |
65 | 67 |
66 @Override | 68 @Override |
67 public void runTest(final boolean exportToFile) throws ServerException, IOException { | 69 public void runTest(final boolean exportToFile) throws ServerException, IOException { |
68 /* Select River */ | 70 /* Select River */ |
83 final String bezugsjahr = String.valueOf(this.bezugsjahr); | 85 final String bezugsjahr = String.valueOf(this.bezugsjahr); |
84 super.feedAndGoSimpleTextInput("singleyear", bezugsjahr); | 86 super.feedAndGoSimpleTextInput("singleyear", bezugsjahr); |
85 | 87 |
86 /* fixierungsauswahl - auto oder manuell */ | 88 /* fixierungsauswahl - auto oder manuell */ |
87 // AUTO: 0, 3 | 89 // AUTO: 0, 3 |
88 final Data q1 = super.getSimpleTextInput("q1", String.valueOf(this.qSectorStart)); | 90 final Data q1 = super.getSimpleTextInput("q1", this.qSectorStart); |
89 final Data q2 = super.getSimpleTextInput("q2", String.valueOf(this.qSectorEnd)); | 91 final Data q2 = super.getSimpleTextInput("q2", this.qSectorEnd); |
90 final Data fixChoice = super.getSimpleTextInput("fix_choice", this.fixationChoice); | 92 final Data fixChoice = super.getSimpleTextInput("fix_choice", this.fixationChoice); |
91 | 93 |
92 final IntDataItem[] arr = new IntDataItem[this.events.length]; | 94 final IntDataItem[] arr = new IntDataItem[this.events.length]; |
93 for (int i = 0; i < this.events.length; i++) { | 95 for (int i = 0; i < this.events.length; i++) { |
94 arr[i] = new IntDataItem("id", "id", this.events[i]); | 96 arr[i] = new IntDataItem("id", "id", this.events[i]); |
111 super.feedAndGo(wqAndMode, // | 113 super.feedAndGo(wqAndMode, // |
112 0);// reachable state index | 114 0);// reachable state index |
113 | 115 |
114 /* calc_choice */ | 116 /* calc_choice */ |
115 final Data preprocessingData = super.getSimpleTextInput("preprocessing", "false"); | 117 final Data preprocessingData = super.getSimpleTextInput("preprocessing", "false"); |
116 final Data functionData = super.getSimpleTextInput("function", "log"); | 118 final Data functionData = super.getSimpleTextInput("function", this.function); |
117 final Data calcChoice = super.getSimpleTextInput("calc_choice", this.calcChoice); | 119 final Data calcChoice = super.getSimpleTextInput("calc_choice", this.calcChoice); |
118 super.feedAndGoData(new Data[] { preprocessingData, functionData, calcChoice }); | 120 super.feedAndGoData(new Data[] { preprocessingData, functionData, calcChoice }); |
119 | 121 |
120 // TODO: automaitische Wahl der Berechnungsgrundlagen + Ausreißer (preprocessing) | 122 // TODO: automaitische Wahl der Berechnungsgrundlagen + Ausreißer (preprocessing) |
121 | 123 |