Sample Conflicts

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)

• Sample Conflicts
  • Members
  • About The Project
    • Structure
  • Usage
  • Contact and support
  • Contributing
  • License
  • Authors and acknowledgment

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:

• Official Repository DISClib.
• Repository for Demo and Examples.

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