Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update website

  • Loading branch information...
commit 481468e4a83d973a4016e3aa4dd9e19f8a20e4a7 1 parent e241365
authored

Showing 2 changed files with 27 additions and 15 deletions. Show diff stats Hide diff stats

  1. 22  index.html
  2. 20  index.html~
22  index.html
@@ -222,14 +222,14 @@ <h1 id="borg">Borg</h1><h1 id="moea">MOEA</h1>
222 222
  
223 223
 1. Definitions
224 224
 
225  
-1.1	"LICENSEE" shall mean the person installing the SOFTWARE if it is solely for personal use by that person on the personal equipment of that person.  If the SOFTWARE is being installed on equipment for use by another legal entity, such as a corporation, limited liability company, partnership, or institution, then the person installing the SOFTWARE by proceeding with the installation certifies that he or she has authority to bind that legal entity to this Agreement; and that legal entity shall be considered to be the LICENSEE.
  225
+"LICENSEE" shall mean the person installing the SOFTWARE if it is solely for personal use by that person on the personal equipment of that person.  If the SOFTWARE is being installed on equipment for use by another legal entity, such as a corporation, limited liability company, partnership, or institution, then the person installing the SOFTWARE by proceeding with the installation certifies that he or she has authority to bind that legal entity to this Agreement; and that legal entity shall be considered to be the LICENSEE.
226 226
 
227 227
 
228 228
 2. Grant and Obligations 
229 229
 
230 230
 Under this License Agreement, LICENSEE is granted nonexclusive and royalty-free rights to practice any patent rights associated with the SOFTWARE, and the SOFTWARE may be used as-is or may be modified, provided that your practice or use is solely for noncommercial, research and education purposes.  You may not distribute the original version or modifications of the SOFTWARE for any purpose.  Both the original version and modified versions of the SOFTWARE may be copied and performed provided that the following terms and conditions are met: 
231 231
 
232  
-2.1	LICENSEE is affiliated with a nonprofit, noncommercial research and educational institution and shall identify the name of the institution and the names(s) of the users of the SOFTWARE to UNIVERSITY via Patrick Reed at the time that LICENSEE acquires this license,
  232
+2.1	LICENSEE is affiliated with a nonprofit, noncommercial research and educational institution and shall identify the name of the institution and the names(s) of the users of the SOFTWARE to UNIVERSITY via Patrick Reed at the time that LICENSEE acquires this license.
233 233
 
234 234
 2.2 	Modified versions of the SOFTWARE must clearly state that the work is a modification of the SOFTWARE and must prominently display the full SOFTWARE title and appropriate copyright notices.  Copyright management information (software identifier and version number, copyright notice and license) shall be retained in all versions of the SOFTWARE.
235 235
 
@@ -241,10 +241,10 @@ <h1 id="borg">Borg</h1><h1 id="moea">MOEA</h1>
241 241
 
242 242
 2.6 	Any publications, reports, course lectures, and/or presentations that employ the SOFTWARE or its derivatives will acknowledge the use of the SOFTWARE or of any of its derivatives by citing the SOFTWARE developed by Dr. Reed and Dr. Hadka. 
243 243
 
  244
+
244 245
 3. Disclaimer of Warranty 
245 246
 
246  
-THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, THE WARRANTY OF NONINFRINGEMENT AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE PENNSYLVANIA STATE UNIVERSITY BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING DIRECT, SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES RESULTING FROM ANY USE OR PERFORMANCE OF THE SOFTWARE INCLUDING, WITHOUT LIMITATION, LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION FOR CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY. 
247  
-                    </textarea><br />
  247
+THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, THE WARRANTY OF NONINFRINGEMENT AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE PENNSYLVANIA STATE UNIVERSITY BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING DIRECT, SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES RESULTING FROM ANY USE OR PERFORMANCE OF THE SOFTWARE INCLUDING, WITHOUT LIMITATION, LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION FOR CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY.</textarea><br />
248 248
                     <input type="checkbox" name="entry.4.group" value="I agree" class="checkbox">By checking this box, you understand and agree to the license terms above.<br>
249 249
 
250 250
                     </div>
@@ -271,10 +271,10 @@ <h1 id="borg">Borg</h1><h1 id="moea">MOEA</h1>
271 271
 
272 272
 <ol>
273 273
 <li>Woodruff, M. et al. <span class="title">Auto-Adaptive Search Capabilities of the New Borg MOEA: A Detailed Comparison on Product Family Design Problems.</span> 12th AIAA Aviation Technology, Integration, and Operations (ATIO) Conference and 14th AIAA/ISSMO Multidisciplinary Analysis and Optimization Conference, Indianapolis, Indiana, 17 September 2012.
274  
-<li>Hadka, D. et al. <span class="title">Diagnostic Assessment of the Borg MOEA on Many-Objective Product Family Design Problems.</span> WCCI 2012 World Congress on Computational Intelligence, Congress on Evolutionary Computation, Brisbane, Australia, 10-15 June 2012, pp. 986-995.
275  
-<li>Reed, P., et al. <span class="title">Evolutionary Multiobjective Optimization in Water Resources: The Past, Present, and Future.</span> (Editor Invited Submission to the 35th Anniversary Special Issue), Advances in Water Resources, In-Press.
276  
-<li>Hadka, D. and P. Reed. <span class="title">Diagnostic Assessment of Search Controls and Failure Modes in Many-Objective Evolutionary Optimization.</span> Evolutionary Computation, 20(3):423-452, 2012.
277  
-<li>Hadka, D. and P. Reed. <span class="title">Borg: An Auto-Adaptive Many-Objective Evolutionary Computing Framework.</span> Evolutionary Computation, In-Press.
  274
+<li>Hadka, D. et al. <span class="title">Diagnostic Assessment of the Borg MOEA on Many-Objective Product Family Design Problems.</span> WCCI 2012 World Congress on Computational Intelligence, Congress on Evolutionary Computation, Brisbane, Australia, 10-15 June 2012, pp. 986-995.  <a href="http://ieeexplore.ieee.org/xpl/articleDetails.jsp?arnumber=6256466">View Details</a>
  275
+<li>Reed, P., et al. <span class="title">Evolutionary Multiobjective Optimization in Water Resources: The Past, Present, and Future.</span> (Editor Invited Submission to the 35th Anniversary Special Issue), Advances in Water Resources, In-Press.  <a href="http://www.sciencedirect.com/science/article/pii/S0309170812000073">View Details</a>
  276
+<li>Hadka, D. and P. Reed. <span class="title">Diagnostic Assessment of Search Controls and Failure Modes in Many-Objective Evolutionary Optimization.</span> Evolutionary Computation, 20(3):423-452, 2012.  <a href="http://www.mitpressjournals.org/doi/abs/10.1162/EVCO_a_00053">View Details</a>
  277
+<li>Hadka, D. and P. Reed. <span class="title">Borg: An Auto-Adaptive Many-Objective Evolutionary Computing Framework.</span> Evolutionary Computation, In-Press.  <a href="http://www.mitpressjournals.org/doi/abs/10.1162/EVCO_a_00075">View Details</a>
278 278
 </ol>
279 279
 
280 280
             </div>
@@ -290,6 +290,12 @@ <h1 id="borg">Borg</h1><h1 id="moea">MOEA</h1>
290 290
                     <h2>Add Your Publication</h2>
291 291
 
292 292
                     <p><a href="mailto:info@borgmoea.org">Tell us</a> about your Borg related publication to get it included in this list.</p>
  293
+
  294
+                    <h2>Links</h2>
  295
+                    <ul>
  296
+                      <li><a href="http://www.coe.psu.edu/water/index.php/Main_Page">Research Group</a></li>
  297
+                      <li><a href="http://www.moeaframework.org/">MOEA Framework</a></li>
  298
+                    </ul>
293 299
             </aside>
294 300
 
295 301
 
20  index.html~
@@ -175,7 +175,7 @@ function validate(f){
175 175
 </script>
176 176
 
177 177
 <div class="ss-form-container" id="form-container">
178  
-<form action="https://docs.google.com/spreadsheet/formResponse?formkey=dEZtVlkwUklJMVJ1TU41N3dpaUhuSHc6MQ" method="POST" target="fake-target" onsubmit="if (validate(this)) {custommsg(); return true;} else return false;">
  178
+<form action="" method="POST" target="fake-target" onsubmit="this.action='https://docs.google.com/spreadsheet/formResponse?formkey=dEZtVlkwUklJMVJ1TU41N3dpaUhuSHc6MQ'; if (validate(this)) {custommsg(); return true;} else return false;">
179 179
 
180 180
                     <div>
181 181
 
@@ -222,14 +222,14 @@ NOW THEREFORE, in consideration of the premises as well as the mutual promises a
222 222
  
223 223
 1. Definitions
224 224
 
225  
-1.1	"LICENSEE" shall mean the person installing the SOFTWARE if it is solely for personal use by that person on the personal equipment of that person.  If the SOFTWARE is being installed on equipment for use by another legal entity, such as a corporation, limited liability company, partnership, or institution, then the person installing the SOFTWARE by proceeding with the installation certifies that he or she has authority to bind that legal entity to this Agreement; and that legal entity shall be considered to be the LICENSEE.
  225
+"LICENSEE" shall mean the person installing the SOFTWARE if it is solely for personal use by that person on the personal equipment of that person.  If the SOFTWARE is being installed on equipment for use by another legal entity, such as a corporation, limited liability company, partnership, or institution, then the person installing the SOFTWARE by proceeding with the installation certifies that he or she has authority to bind that legal entity to this Agreement; and that legal entity shall be considered to be the LICENSEE.
226 226
 
227 227
 
228 228
 2. Grant and Obligations 
229 229
 
230 230
 Under this License Agreement, LICENSEE is granted nonexclusive and royalty-free rights to practice any patent rights associated with the SOFTWARE, and the SOFTWARE may be used as-is or may be modified, provided that your practice or use is solely for noncommercial, research and education purposes.  You may not distribute the original version or modifications of the SOFTWARE for any purpose.  Both the original version and modified versions of the SOFTWARE may be copied and performed provided that the following terms and conditions are met: 
231 231
 
232  
-2.1	LICENSEE is affiliated with a nonprofit, noncommercial research and educational institution and shall identify the name of the institution and the names(s) of the users of the SOFTWARE to UNIVERSITY via Patrick Reed at the time that LICENSEE acquires this license,
  232
+2.1	LICENSEE is affiliated with a nonprofit, noncommercial research and educational institution and shall identify the name of the institution and the names(s) of the users of the SOFTWARE to UNIVERSITY via Patrick Reed at the time that LICENSEE acquires this license.
233 233
 
234 234
 2.2 	Modified versions of the SOFTWARE must clearly state that the work is a modification of the SOFTWARE and must prominently display the full SOFTWARE title and appropriate copyright notices.  Copyright management information (software identifier and version number, copyright notice and license) shall be retained in all versions of the SOFTWARE.
235 235
 
@@ -241,10 +241,10 @@ Under this License Agreement, LICENSEE is granted nonexclusive and royalty-free
241 241
 
242 242
 2.6 	Any publications, reports, course lectures, and/or presentations that employ the SOFTWARE or its derivatives will acknowledge the use of the SOFTWARE or of any of its derivatives by citing the SOFTWARE developed by Dr. Reed and Dr. Hadka. 
243 243
 
  244
+
244 245
 3. Disclaimer of Warranty 
245 246
 
246  
-THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, THE WARRANTY OF NONINFRINGEMENT AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE PENNSYLVANIA STATE UNIVERSITY BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING DIRECT, SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES RESULTING FROM ANY USE OR PERFORMANCE OF THE SOFTWARE INCLUDING, WITHOUT LIMITATION, LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION FOR CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY. 
247  
-                    </textarea><br />
  247
+THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, THE WARRANTY OF NONINFRINGEMENT AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE PENNSYLVANIA STATE UNIVERSITY BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING DIRECT, SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES RESULTING FROM ANY USE OR PERFORMANCE OF THE SOFTWARE INCLUDING, WITHOUT LIMITATION, LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION FOR CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY.</textarea><br />
248 248
                     <input type="checkbox" name="entry.4.group" value="I agree" class="checkbox">By checking this box, you understand and agree to the license terms above.<br>
249 249
 
250 250
                     </div>
@@ -256,7 +256,7 @@ THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISC
256 256
 </form>
257 257
 </div>
258 258
 <div class="ss-form-container" style="display:none;" id="form-message"><b>Your request for the Borg MOEA has been received.  We will contact you by e-mail in three business days.</b></div>
259  
-<iframe id="fake-target" src="blank.html" style="width:0px; height:0px; border:0px;"></iframe>
  259
+<iframe id="fake-target" name="fake-target" src="blank.html" style="width:0px; height:0px; border:0px;"></iframe>
260 260
             </div>
261 261
 
262 262
             <a class="back-to-top" href="#main">Back to Top</a>
@@ -289,7 +289,13 @@ THIS SOFTWARE IS MADE AVAILABLE "AS-IS."  THE PENNSYLVANIA STATE UNIVERSITY DISC
289 289
 
290 290
                     <h2>Add Your Publication</h2>
291 291
 
292  
-                    <p><a href="mailto:admin@borgmoea.org">Tell us</a> about your Borg related publication to get it included in this list.</p>
  292
+                    <p><a href="mailto:info@borgmoea.org">Tell us</a> about your Borg related publication to get it included in this list.</p>
  293
+
  294
+                    <h2>Links</h2>
  295
+                    <ul>
  296
+                      <li><a href="http://www.coe.psu.edu/water/index.php/Main_Page">Research Group</a></li>
  297
+                      <li><a href="http://www.moeaframework.org/">MOEA Framework</a></li>
  298
+                    </ul>
293 299
             </aside>
294 300
 
295 301
 

0 notes on commit 481468e

Please sign in to comment.
Something went wrong with that request. Please try again.