Giter VIP home page Giter VIP logo

isis1225-sampleconflicts's Introduction

Sample Conflicts

Contributors Forks Stargazers Issues License

This is the second laboratory's repository. Its objective is to practice the GIT (i.e.: Clone, Pull, Push, Commit, Stage, Checkout) commands to update shared code and solve code conflicts with GIT and GitHub between developers’ branches.

This repository is part of the data structure and algorithms (#EDA) teaching framework at Universidad de los Andes. The repository was developed by faculty professors and staff in the Department of Systems and Computer Engineer (#DISC) and uses the Non-Object-Oriented Python library DISCLib.

DISClib · DISClib Demo and Examples · Report Bug · Request Feature

Table of Contents (up to date)

Members

The students edit this section to add their names, Uniandes emails, and specify which project functionality of the project they will implement.

  1. Student No. 1 Name, Student No. 1 Uniandes Email, Student No. 1 owned functionality.
  2. Student No. 2 Name, Student No. 2 Uniandes Email, Student No. 2 owned functionality.
  3. Student No. 3 Name, Student No. 3 Uniandes Email, Student No. 3 owned functionality.

Back to top

About The Project

This is a template repository to use in the laboratories in the data structures and algorithms (#EDA) course at Uniandes.

IMPORTANT This is a work in progress and is part of a teaching framework for undergraduate college students at Universidad de los Andes. This project Is NOT intended as a full-functional source code project.

Back to top

Structure

This laboratory repository has four main parts:

  1. DISClib Root folder with the official course library. For more on its implementation visit the DISClib Repository.
  2. App Folder with the Model-View-Controller (MVC) Python scripts. In here the students implement their code to complete the laboratory instructions.
  3. Data Folder with CSV data files to load into the application. In here the students add the data files provided by the course staff to complete the laboratory.
  4. Docs Folder with the report, data table and other documentation. In here the students add their project report, data tables and other files to complement their code implementation.

Back to top

Usage

To use this template, you need to follow the steps below:

  • Read the official laboratory instructions published in the course official site at [BrightSpace][BrightSpace-url].
  • Distribute the laboratory tasks between to the group members.
  • Download the laboratory official dataset from the course official site at[BrightSpace][BrightSpace-url].
  • Unzip and load the dataset into the application at Data folder.
  • Implement the missing functions according to the laboratory instructions in the MVC scripts at App folder.
  • Complete the laboratory report, record your tests and analysis in the documents at Docs folder according to the instructions (The report MUST BE in PDF format).

Back to top

Contact and support

For further information and contact, use the following links:

If you require further information, please contact us via this email

Back to top

Contributing

Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make are greatly appreciated.

If you have a suggestion that would make this project better, please fork the repo and create a pull request. You can also simply open an issue with the tag "enhancement".

Don't forget to give the project a star! Thanks again!

  1. Fork the Project.
  2. Create your Feature Branch (git checkout -b feature/AmazingFeature).
  3. Commit your Changes (git commit -m 'Add some AmazingFeature').
  4. Push to the Branch (git push origin feature/AmazingFeature).
  5. Open a Pull Request.

Back to top

License

Copyright 2020, Departamento de sistemas y Computación, Universidad de Los Andes. Developed for the class "ISIS1225 - Estructuras de Datos y Algoritmos" or "ISIS1225 - Data Structure and Algorithms" in english.

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more information go to GNU ORG.

Back to top

Authors and acknowledgment

  • Dario Correal is the original author and main developer of the library.
  • Santiago Arteaga is a contributor and repository administrator.
  • Luis Florez is a contributor and developed examples and tutorials for the library.

Back to top

isis1225-sampleconflicts's People

Contributors

danr844 avatar dariocorreal avatar juanariza17 avatar phillipus85 avatar

Watchers

 avatar  avatar  avatar  avatar

Forkers

pruebasss465 maicolrincon eda-20201-1-sec02-g-9 eda2021-1-sec02-g04 eda2021-1-sec02-g07 eda2021-1-sec02-g01 cesar-david-quiros-sierra eda2021-1-sec02-g11 eda2021-1-sec3-g04 estructuradedatosyalgoritmos-grupo1 eda2021-1-sec03-g08 fuckeverione ssduque eda2021-1-sec03-g05 eda2021-1-sec03-g10 eda2021-1-sec06-g02 eda2021-1-sec06-g12 eda2021-1-sec06-g01 eda2021-1-sec06-g03 gabriel-sanchez-106 eda2021-1-sec07-g07 eda202021-1-sec07-g03 eda2021-1-sec07-g13 eda2021-1-sec07-g06 eda2021-1-sec07-g-2grupo eda2021-1-sec07-g09 eda2021-1-sec-7-g-12 eda2021-sec07g-08 eda2021-1-sec07-g01 eda2021-1-sec06-g10 eda2021-1-sec04-g04 eda2021-1-sec06-g06 eda2021-1-sec04-g10 eda2021-1-sec04-g01 eda2021-1-sec04-g03 eda2021-1-sec04-g05 eda2021-1-sec04-g2 eda2021-1-sec04-g06 danr844 andes-blockchainlab-public juansh11 eda2021-1-sec05-g-02 eda2021-1-sec05-g03 eda2021-1-sec05-g003 jcruxv eda2021-1-sec05-vld nicomb22 jecv2409 eda2021-1-sec06-g09 ncano27 eda20201-1-sec05-g6 eda2021-1-sec-02-g-03 felipenunezpinillos eda2021-1-sec05-g-1-valentinagoyeneche eda2021-1-sec05-g8 eda2021-1-sec02-g02 eda2021-1-sec04-g11 pguatibonza eda2021-1-sec3-g2 eda2021-1-sec06-g08 eda2021-1-sec05-g5 eda2021-1-sec02-g10 valegoyeneche ddummann eda2021-1-sec05-g-10 los-flaquitos-bonitos eda2021-01 ehimar danielaalvarez1 eda2021-1-sec05-g4 eda2021-1-sec05-g13 eda2021-1-sec05-g-1 sebastianc29 estructurasdedatosyalgoritmos-2 miguelcas00 andresserranoc eda2021-1-sec06-g05 eda2021-1-sec4-g12 eda2021-1-sec02-g08 eda2021-1-sec02-g-05 eda2021-1-sec06-g07 eda2021-1-sec07-g04 mussov eda2021-1-sec05-g7 eda2021-1-sec07-g-05 eda2021-1-sec03-g03 eda2021-1-sec04-g08 eda2021-1-sec07-g10 edasec-04-equipo-06 eda2021-1-sec06-g11 eda2021-1-sec02-g03 eda2021-1-sec02-g012 alejandro-alvarez-jim lindsaypinto eda2021-1-sec02-g6 valenzapata11 eda2021-19-sec01-g06 eda2021-19-sec01-g08 eda2021-19-sec-1-go7 eda2021-19-sec01-g5

isis1225-sampleconflicts's Issues

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.